Ajout d'une interface Rest sur le workbench pour la plate-forme pymma

+ suppression travail sur kie-server spring-boot

drools-framework-kie-wb-parent/kie-drools-framework-rest-backend/pom.xml

@@ -16,6 +16,76 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+            <version>1.0.0.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+            <version>1.0.0.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-nio2-model</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-nio2-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-io</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-project-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-rest-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.uberfire</groupId>
+            <artifactId>uberfire-structure-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--dependency>
             <groupId>org.uberfire</groupId>
             <artifactId>uberfire-rest-client</artifactId>
         </dependency>
@@ -40,10 +110,7 @@
             <groupId>org.uberfire</groupId>
             <artifactId>uberfire-project-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.uberfire</groupId>
             <artifactId>uberfire-api</artifactId>
@@ -113,8 +180,7 @@
             <artifactId>uberfire-services-api</artifactId>
         </dependency>
 
-        <!-- The version of commons-io in droolsjbpm-build-bootstrap pom is way too old-->
-        <dependency>
+         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
@@ -148,7 +214,7 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.1</version>
-        </dependency>
+        </dependency-->
     </dependencies>
 
 

drools-framework-kie-wb-parent/kie-drools-framework-rest-backend/src/main/java/org/chtijbug/kie/rest/backend/PackageResource.java

@@ -1,9 +1,9 @@
 package org.chtijbug.kie.rest.backend;
 
+
 import org.guvnor.common.services.project.model.WorkspaceProject;
 import org.guvnor.common.services.project.service.WorkspaceProjectService;
 import org.guvnor.rest.client.ProjectResponse;
-import org.guvnor.rest.client.Space;
 import org.guvnor.structure.organizationalunit.OrganizationalUnit;
 import org.guvnor.structure.organizationalunit.OrganizationalUnitService;
 import org.guvnor.structure.repositories.PublicURI;
@@ -12,6 +12,7 @@ import org.guvnor.structure.repositories.RepositoryService;
 import org.slf4j.LoggerFactory;
 import org.uberfire.io.IOService;
 import org.uberfire.java.nio.file.DirectoryStream;
+import org.uberfire.spaces.Space;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -25,6 +26,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+
 @Path("/chtijbug")
 @Named
 @ApplicationScoped
@@ -57,30 +59,26 @@ public class PackageResource {
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/detailedSpaces")
     // @RolesAllowed({REST_ROLE, REST_PROJECT_ROLE})
-    public Collection<Space> getProjects() {
+    public Collection<ProjectResponse> getProjects() {
         logger.debug("-----getSpaces--- ");
 
-        final List<Space> spaces = new ArrayList<Space>();
+        final List<ProjectResponse> spaces = new ArrayList<>();
         for (OrganizationalUnit ou : organizationalUnitService.getOrganizationalUnits()) {
-            spaces.add(getSpace(ou));
+            spaces.addAll(getSpace(ou));
         }
 
         return spaces;
     }
 
-    private Space getSpace(OrganizationalUnit ou) {
-        final Space space = new Space();
-        space.setName(ou.getName());
-        space.setOwner(ou.getOwner());
-        space.setDefaultGroupId(ou.getDefaultGroupId());
+    private List<ProjectResponse> getSpace(OrganizationalUnit ou) {
+        final Space space = new Space(ou.getName());
 
         final List<ProjectResponse> repoNames = new ArrayList<>();
         for (WorkspaceProject workspaceProject : workspaceProjectService.getAllWorkspaceProjects(ou)) {
             repoNames.add(getProjectResponse(workspaceProject));
         }
 
-        space.setProjects(repoNames);
-        return space;
+        return repoNames;
     }
 
     private ProjectResponse getProjectResponse(WorkspaceProject workspaceProject) {

drools-framework-kie-wb-parent/kie-wb/pom.xml

@@ -12,16 +12,15 @@
   <artifactId>kie-wb</artifactId>
 
   <packaging>pom</packaging>
-  <name>Pymma platform jbpm-console</name>
-  <description>Pymma Plarform Kie-wb
-  </description>
+    <name>Pymma platform workbench</name>
+    <description>Pymma Plarform Kie-wb</description>
   <dependencies>
 
-    <!--dependency>
+      <dependency>
       <groupId>com.pymmasoftware.jbpm</groupId>
       <artifactId>kie-drools-framework-rest-backend</artifactId>
       <version>${project.version}</version>
-    </dependency-->
+      </dependency>
 
     <dependency>
       <groupId>org.kie</groupId>