Work on using branch per project

drools-framework-business-proxy-parent/drools-framework-business-indexer-app/drools-framework-business-indexer-app.iml

@@ -97,8 +97,8 @@
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-api:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.31.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-api:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.35.0.Final" level="project" />
   </component>
 </module>

drools-framework-business-proxy-parent/drools-framework-business-indexer-persistence/drools-framework-business-indexer-persistence.iml

@@ -95,8 +95,8 @@
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-api:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.31.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-api:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.35.0.Final" level="project" />
   </component>
 </module>

drools-framework-business-proxy-parent/drools-framework-business-proxy-app/src/main/resources/application.properties

@@ -24,5 +24,4 @@ spring.data.mongodb.host=localhost:28017
 
 
 eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
-spring.application.name=proxy-app-${org.kie.server.id}
-kie-wb.m2repo=http://host.docker:8080/kie-wb/maven2/
+spring.application.name=proxy-app-${org.kie.server.id}

drools-framework-business-proxy-parent/drools-framework-business-proxy-persistence/src/main/java/org/chtijbug/drools/proxy/persistence/model/ProjectPersist.java

@@ -2,6 +2,8 @@ package org.chtijbug.drools.proxy.persistence.model;
 
 import org.chtijbug.drools.proxy.persistence.json.KieProject;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.CompoundIndex;
+import org.springframework.data.mongodb.core.index.CompoundIndexes;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
@@ -10,6 +12,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Document
+@CompoundIndexes({
+        @CompoundIndex(def = "{'projectName':1, 'branch':1}", name = "projectName_branch_Index")
+})
 public class ProjectPersist  implements Serializable {
 
     public static final String ADEFINIR="A définir";
@@ -23,6 +28,9 @@ public class ProjectPersist  implements Serializable {
 
     @Id
     @Indexed
+    private String uuid;
+
+
     private KieProject projectName;
 
     private String mainClass;
@@ -37,6 +45,8 @@ public class ProjectPersist  implements Serializable {
 
     private String containerID;
 
+    private String branch;
+
     private List<String> serverNames= new ArrayList<>();
 
     private String status;
@@ -146,6 +156,14 @@ public class ProjectPersist  implements Serializable {
         this.classNameList = classNameList;
     }
 
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
     public ProjectPersist duplicate(){
         ArrayList<String> listServerNames = new ArrayList<String>();
         listServerNames.addAll(serverNames);

drools-framework-business-proxy-parent/drools-framework-business-proxy-persistence/src/main/java/org/chtijbug/drools/proxy/persistence/model/RuntimePersist.java

@@ -20,6 +20,9 @@ public class RuntimePersist {
     private String serverName;
 
     private String version;
+
+    private String branch;
+
     @Indexed
     private String hostname;
 
@@ -145,4 +148,12 @@ public class RuntimePersist {
     public void setTimeStamp(Date timeStamp) {
         this.timeStamp = timeStamp;
     }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
 }

drools-framework-business-proxy-parent/drools-framework-business-proxy-persistence/src/main/java/org/chtijbug/drools/proxy/persistence/repository/ProjectRepository.java

@@ -10,7 +10,8 @@ import java.util.List;
 @Repository
 public interface ProjectRepository extends MongoRepository<ProjectPersist, String> {
 
-    public ProjectPersist findByProjectName(KieProject projectName);
+    public List<ProjectPersist> findByProjectName(KieProject projectName);
+    public ProjectPersist findByProjectNameAndBranch(KieProject projectName,String branch);
     public ProjectPersist findByDeploymentName(String deploymentName);
     public List<ProjectPersist> findByServerNamesIn(List<String> serverNames);
     public List<ProjectPersist> findByServerNamesInAndDeploymentName(List<String> serverNames,String deploymentName);

drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/drools-framework-business-reverse-proxy.iml

@@ -41,9 +41,9 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-api:7.31.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.31.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-api:7.35.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.35.0.Final" level="project" />
     <orderEntry type="library" name="Maven: com.github.mkopylec:charon-spring-boot-starter:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />

drools-framework-business-proxy-parent/drools-framewwork-business-proxy-persistence/drools-framewwork-business-proxy-persistence.iml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.7" level="project" />
-  </component>
-</module>

drools-framework-business-proxy-parent/pom.xml

@@ -19,7 +19,7 @@
     </properties>
     <modules>
         <module>drools-framework-business-proxy-app</module>
-        <module>drools-framewwork-business-proxy-persistence</module>
+        <module>drools-framework-business-proxy-persistence</module>
         <module>drools-framework-business-indexer-app</module>
         <module>drools-framework-business-indexer-persistence</module>
         <module>drools-framework-business-reverse-proxy</module>