nheron/kie-platform
nheron/kie-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work on using branch per project

Browse source
This commit is contained in:
Nicolas Héron 2020-04-14 08:56:20 +02:00
commit b37a988a03
42 changed files with 121 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drools-framework-base-tools-parent/drools-framework-kie-wb-parent/drools-framework-kie-wb-rest-pojo/src/main/java/org/chtijbug/guvnor/server/jaxrs/model/PlatformProjectResponse.java
View file

@ -9,6 +9,8 @@ public class PlatformProjectResponse extends ProjectResponse {
private String artifactId;
private String branch;
private List<String> javaClasses = new ArrayList<>();
public PlatformProjectResponse() {
@ -30,4 +32,12 @@ public class PlatformProjectResponse extends ProjectResponse {
public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
public String getBranch() {
return branch;
}
public void setBranch(String branch) {
this.branch = branch;
}
}

19
drools-framework-base-tools-parent/drools-framework-kie-wb-parent/kie-drools-framework-rest-backend/src/main/java/org/chtijbug/kie/rest/backend/PackageResource.java
View file

@ -18,8 +18,8 @@ import org.kie.workbench.common.screens.datamodeller.model.EditorModelContent;
import org.kie.workbench.common.screens.datamodeller.service.DataModelerService;
import org.kie.workbench.common.services.datamodeller.core.DataObject;
import org.kie.workbench.common.services.datamodeller.core.impl.DataModelImpl;
import org.kie.workbench.common.services.shared.project.KieModule;
import org.slf4j.LoggerFactory;
import org.uberfire.backend.vfs.PathFactory;
import org.uberfire.io.IOService;
import org.uberfire.java.nio.base.options.CommentedOption;
import org.uberfire.java.nio.file.DirectoryStream;
@ -70,6 +70,7 @@ public class PackageResource {
@Inject
private WorkspaceProjectService workspaceProjectService;
public PackageResource() {
System.out.println("coucou");
}
@ -118,7 +119,11 @@ public class PackageResource {
final List<PlatformProjectResponse> repoNames = new ArrayList<>();
for (WorkspaceProject workspaceProject : workspaceProjectService.getAllWorkspaceProjects(ou)) {
repoNames.add(getProjectResponse(workspaceProject));
for (Branch branch : workspaceProject.getRepository().getBranches()){
repoNames.add(getProjectResponse(workspaceProject,branch));
}
}
return repoNames;
@ -129,14 +134,16 @@ public class PackageResource {
}
private PlatformProjectResponse getProjectResponse(WorkspaceProject workspaceProject) {
private PlatformProjectResponse getProjectResponse(WorkspaceProject workspaceProject,Branch branch) {
final PlatformProjectResponse projectResponse = new PlatformProjectResponse();
projectResponse.setName(workspaceProject.getName());
projectResponse.setSpaceName(workspaceProject.getOrganizationalUnit().getName());
if (workspaceProject.getMainModule() != null) {
Module kmodule = workspaceProject.getMainModule();
EditorModelContent econtent = dataModelerService.loadContent(((KieModule) kmodule).getImportsPath());
org.uberfire.backend.vfs.Path importVFPath = PathFactory.newPath("project.imports", branch.getPath().toURI()+"project.imports");
EditorModelContent econtent = dataModelerService.loadContent(importVFPath);
//EditorModelContent econtent = dataModelerService.loadContent(((KieModule) kmodule).getImportsPath());
DataModelImpl econtentDataModel = (DataModelImpl) econtent.getDataModel();
List<DataObject> dataObjects = econtentDataModel.getExternalClasses();
for (DataObject dataObject : dataObjects) {
@ -149,6 +156,7 @@ public class PackageResource {
projectResponse.setGroupId(workspaceProject.getMainModule().getPom().getGav().getGroupId());
projectResponse.setVersion(workspaceProject.getMainModule().getPom().getGav().getVersion());
projectResponse.setDescription(workspaceProject.getMainModule().getPom().getDescription());
projectResponse.setBranch(branch.getName());
}
final ArrayList<org.guvnor.rest.client.PublicURI> publicURIs = new ArrayList<>();
@ -412,8 +420,11 @@ public class PackageResource {
WorkspaceProject project = getProject(organizationalUnitName, projectName);
if (project != null) {
// Optional<Branch> rr = project.getRepository().getBranch("ee");
// org.uberfire.backend.vfs.Path tata = rr.get().getPath();
org.uberfire.backend.vfs.Path rootPath = project.getRootPath();
org.uberfire.java.nio.file.Path nioPath = Paths.get(rootPath.toURI());
DirectoryStream<org.uberfire.java.nio.file.Path> directoryStream = ioService.newDirectoryStream(nioPath);
org.uberfire.java.nio.file.Path elementToUpdate = getFileElementPath(directoryStream, assetName);
File fileToUpdate = elementToUpdate.toFile();

1
drools-framework-base-tools-parent/drools-framework-kie-wb-parent/kie-wb/src/main/resources/WEB-INF/web.xml
View file

@ -138,7 +138,6 @@
<filter-name>HTTP Basic Auth Filter</filter-name>
<url-pattern>/git/*</url-pattern>
<url-pattern>/rest/*</url-pattern>
<url-pattern>/maven2/*</url-pattern>
<url-pattern>/ws/*</url-pattern>
</filter-mapping>

4
drools-framework-base-tools-parent/drools-framework-runtime-entity/src/main/java/org/chtijbug/drools/runtimeevent/impl/fact/DeleteFactEventStrategy.java
View file

@ -44,6 +44,10 @@ public class DeleteFactEventStrategy implements AbstractMemoryEventHandlerStrate
} else { // inserted from a rule that is not in a ruleflow/process
existingInSessionRuleExecution = sessionContext.getRuleExecution();
if (existingInSessionRuleExecution==null){
existingInSessionRuleExecution = new RuleExecution();
sessionContext.setRuleExecution(existingInSessionRuleExecution);
}
existingInSessionRuleExecution.getThenFacts().add(fact);
}

2
drools-framework-base-tools-parent/pom.xml
View file

@ -13,7 +13,7 @@
<modules>
<module>drools-framework-common</module>
<module>drools-framework-examples</module>
<!--module>drools-framework-kie-server-parent</module-->
<module>drools-framework-kie-server-parent</module>
<module>drools-framework-runtime-base</module>
<module>drools-framework-runtime-entity</module>
<module>drools-framework-kie-wb-parent</module>