Ajout Thortil kieserver

configuration/kie-wb/application-roles.properties

@@ -2,33 +2,40 @@ admin=admin,analyst,kiemgmt,admingroup,rest-all
 
 kieserver=kie-server,,rest-all
 workbench=admin,kie-server
+
 #pymma
 nheron=admin,analyst,kiemgmt,admingroup,rest-all
-guillaume=analyst,kiemgmt,pymma,pymma
+guillaume=analyst,kiemgmt,pymma,pymma,rest-all
-maxime=analyst,kiemgmt,pymma
+maxime=analyst,kiemgmt,pymma,rest-all
-donatienne=analyst,kiemgmt,pymma
+donatienne=analyst,kiemgmt,pymma,rest-all
+
+
+
+
+
+
 #auchan
-igor=analyst,auchan
+igor=analyst,auchan,rest-all
-florian=analyst,auchan
+florian=analyst,auchan,rest-all
+
 #oney
-thomas=analyst,oney
+thomas=analyst,oney,rest-all
-christopheev=analyst,oney
+christopheev=analyst,oney,rest-all
+
 #probtp
-pascal=analyst,probtp
+pascal=analyst,probtp,rest-all
+
+
 #training
-student01a=analyst,groupe01
+student01=analyst,training,rest-all
-student01b=analyst,groupe01
+student02=analyst,training,rest-all
-student02a=analyst,groupe02
+student03=analyst,training,rest-all
-student02b=analyst,groupe02
+student04=analyst,training,rest-all
-student03a=analyst,groupe03
+student05=analyst,training,rest-all
-student03b=analyst,groupe03
+student06=analyst,training,rest-all
-student04a=analyst,groupe04
+student07=analyst,training,rest-all
-student04b=analyst,groupe04
+student08=analyst,training,rest-all
-student05a=analyst,groupe05
+student09=analyst,training,rest-all
-student05b=analyst,groupe05
+student10=analyst,training,rest-all
-student06a=analyst,groupe06
+student11=analyst,training,rest-all
-student06b=analyst,groupe06
+student12=analyst,training,rest-all
-student07a=analyst,groupe07
-student07b=analyst,groupe07
-student08a=analyst,groupe08
-student08b=analyst,groupe08

configuration/kie-wb/application-users.properties

@@ -1,7 +1,8 @@
-admin=adminblqndine
+admin=adminpymma
 kieserver=kieserver1!
+
 #pymma
-nheron=blqndine
+nheron=nicoPassword
 guillaume=hochart
 maxime=picault
 donatienne=yovo
@@ -14,19 +15,15 @@ christopheev=oney
 # probtp
 pascal=probtp
 #training
-student01a=pymma
+student01=mybrmspymma01a
-student01b=pymma
+student02=mybrmspymma02b
-student02a=pymma
+student03=mybrmspymma03c
-student02b=pymma
+student04=mybrmspymma04d
-student03a=pymma
+student05=mybrmspymma05e
-student03b=pymma
+student06=mybrmspymma06f
-student04a=pymma
+student07=mybrmspymma07g
-student04b=pymma
+student08=mybrmspymma08h
-student05a=pymma
+student09=mybrmspymma09i
-student05b=pymma
+student10=mybrmspymma10j
-student06a=pymma
+student11=mybrmspymma11k
-student06b=pymma
+student12=mybrmspymma12l
-student07a=pymma
-student07b=pymma
-student08a=pymma
-student08b=pymma

drools-framework-kie-server-parent/drools-framework-kie-server-thorntail/src/main/resources/META-INF/services/org.wildfly.swarm.container.runtime.ServerConfiguration

@@ -1 +0,0 @@
-org.wildfly.swarm.drools.server.runtime.DroolsServerConfiguration

drools-framework-kie-server-parent/drools-framework-kie-server-thorntail/src/main/resources/config/security/application-roles.properties

@@ -1 +0,0 @@
-kieserver=kie-server

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

@@ -15,8 +15,6 @@
         <module>drools-framework-kie-server-rest-drools</module>
         <module>drools-framework-kie-server-client-connector</module>
         <module>drools-framework-kie-server-extension-interface</module>
-        <!--module>drools-framework-thorntail-jar</module>
-        <module>drools-framework-kie-server-thorntail</module-->
         <!--module>drools-framework-kie-server-spring-boot-autoconfiguration-drools</module>
         <module>drools-framework-kie-server-spring-boot</module-->
     </modules>

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/module.conf

@@ -5,5 +5,4 @@ org.wildfly.swarm.security
 org.wildfly.swarm.configuration
 io.undertow.servlet
 io.undertow.core
-org.jboss.resteasy.resteasy-jackson-provider
+org.jboss.resteasy.resteasy-jackson-provider
-

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/pom.xml

@@ -14,13 +14,13 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>io.thorntail</groupId>
+    <artifactId>drools-framework-thorntail-fraction</artifactId>
-    <artifactId>drools-chtijbug-server</artifactId>
 
-    <name>Drools Chtijbug standalone Server</name>
+    <name>Drools Server thorntail fraction</name>
-    <description>Drools Server thorntail</description>
+    <description>Drools Server thorntail fraction</description>
 
     <packaging>jar</packaging>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -33,6 +33,25 @@
         </dependencies>
     </dependencyManagement>
 
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.thorntail</groupId>
+                <artifactId>thorntail-fraction-plugin</artifactId>
+                <version>90</version>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>io.thorntail</groupId>
@@ -45,11 +64,23 @@
             <version>${version.thorntail}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>io.thorntail</groupId>
             <artifactId>jaxrs</artifactId>
             <version>${version.thorntail}</version>
         </dependency>
+        <dependency>
+            <groupId>io.thorntail</groupId>
+            <artifactId>jaxrs-cdi</artifactId>
+            <version>${version.thorntail}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.thorntail</groupId>
+            <artifactId>ejb</artifactId>
+            <version>${version.thorntail}</version>
+        </dependency>
+
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
@@ -63,58 +94,17 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- kie drools server dependencies -->
-        <dependency>
-            <groupId>org.kie.server</groupId>
-            <artifactId>kie-server-services-common</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.security.jacc</groupId>
-                    <artifactId>jboss-jacc-api_1.4_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jaxrs-api</artifactId>
-                    <groupId>org.jboss.resteasy</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>resteasy-jaxrs</artifactId>
-                    <groupId>org.jboss.resteasy</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>resteasy-jaxb-provider</artifactId>
-                    <groupId>org.jboss.resteasy</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.kie.server</groupId>
-            <artifactId>kie-server-rest-common</artifactId>
-        </dependency>
 
         <!-- drools kie server dependencies -->
         <dependency>
-            <groupId>org.kie.server</groupId>
+            <groupId>com.pymmasoftware.jbpm</groupId>
-            <artifactId>kie-server-services-drools</artifactId>
+            <artifactId>drools-framework-kie-server-services-drools</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.kie.server</groupId>
+            <groupId>com.pymmasoftware.jbpm</groupId>
-            <artifactId>kie-server-rest-drools</artifactId>
+            <artifactId>drools-framework-kie-server-rest-drools</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/java/org/chtijbug/swarm/drools/server/runtime/DroolsDeploymentProducer.java

@@ -1,4 +1,4 @@
-package org.wildfly.swarm.drools.server.runtime;
+package org.chtijbug.swarm.drools.server.runtime;
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/java/org/chtijbug/swarm/drools/server/runtime/DroolsFrameworkFraction.java

@@ -1,4 +1,4 @@
-package org.wildfly.swarm.drools.server.runtime;
+package org.chtijbug.swarm.drools.server.runtime;
 
 import org.wildfly.swarm.bootstrap.util.TempFileManager;
 import org.wildfly.swarm.config.security.Flag;
@@ -7,6 +7,7 @@ import org.wildfly.swarm.config.security.security_domain.ClassicAuthentication;
 import org.wildfly.swarm.config.security.security_domain.authentication.LoginModule;
 import org.wildfly.swarm.security.SecurityFraction;
 import org.wildfly.swarm.spi.api.Customizer;
+import org.wildfly.swarm.spi.api.Fraction;
 import org.wildfly.swarm.spi.runtime.annotations.Post;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -22,7 +23,7 @@ import java.nio.file.StandardCopyOption;
  */
 @Post
 @ApplicationScoped
-public class DroolsSetup implements Customizer {
+public class DroolsFrameworkFraction implements Customizer, Fraction {
 
     private static String configFolder = System.getProperty("org.drools.server.swarm.security.conf");
 
@@ -32,18 +33,17 @@ public class DroolsSetup implements Customizer {
 
     @Override
     public void customize() throws Exception {
-        if (System.getProperty("org.drools.server.swarm.security.conf") == null) {
+
-            //Path dir = Files.createTempDirectory("swarm-keycloak-config");
+        //Path dir = Files.createTempDirectory("swarm-keycloak-config");
-            File dir = TempFileManager.INSTANCE.newTempDirectory("swarm-drools-security-config", ".d");
+        File dir = TempFileManager.INSTANCE.newTempDirectory("swarm-drools-security-config", ".d");
-            System.setProperty("org.drools.server.swarm.conf", dir.getAbsolutePath());
+        System.setProperty("org.drools.server.swarm.conf", dir.getAbsolutePath());
-            Files.copy(getClass().getClassLoader().getResourceAsStream("config/security/application-users.properties"),
+        Files.copy(getClass().getClassLoader().getResourceAsStream("config/security/application-users.properties"),
-                    dir.toPath().resolve("application-users.properties"),
+                dir.toPath().resolve("application-users.properties"),
-                    StandardCopyOption.REPLACE_EXISTING);
+                StandardCopyOption.REPLACE_EXISTING);
-            Files.copy(getClass().getClassLoader().getResourceAsStream("config/security/application-roles.properties"),
+        Files.copy(getClass().getClassLoader().getResourceAsStream("config/security/application-roles.properties"),
-                    dir.toPath().resolve("application-roles.properties"),
+                dir.toPath().resolve("application-roles.properties"),
-                    StandardCopyOption.REPLACE_EXISTING);
+                StandardCopyOption.REPLACE_EXISTING);
-            configFolder = dir.toPath().toString();
+        configFolder = dir.toPath().toString();
-        }
 
 
         LoginModule<?> loginModule = new LoginModule<>("UsersRoles");

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/java/org/chtijbug/swarm/drools/server/runtime/DroolsMessages.java

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.wildfly.swarm.drools.server.runtime;
+package org.chtijbug.swarm.drools.server.runtime;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/resources/META-INF/application.properties

@@ -0,0 +1,2 @@
+swarm.http.port=9080
+jboss.http.port=9080

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  Thorntail :: Examples :: Camel CDI
+  %%
+  Copyright (C) 2016 RedHat
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+
+<!-- Marker file indicating CDI should be enabled -->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xsi:schemaLocation="
+        http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+</beans>

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/resources/config/security/application-roles.properties

@@ -0,0 +1 @@
+kieserver=kie-server,ret-all

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-fraction/src/main/resources/config/web/jboss-web.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jboss-web>
-    <context-root>/drools</context-root>
+    <context-root>/kie-server</context-root>
     <security-domain>other-drools</security-domain>
 </jboss-web>

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-jar/pom.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>drools-framework-kie-server-parent</artifactId>
+        <groupId>com.pymmasoftware.jbpm</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>drools-framework-thorntail-jar</artifactId>
+    <packaging>jar</packaging>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.thorntail</groupId>
+                <artifactId>bom</artifactId>
+                <version>${version.thorntail}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.pymmasoftware.jbpm</groupId>
+            <artifactId>drools-framework-thorntail-fraction</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- kie drools server dependencies -->
+        <dependency>
+            <groupId>org.kie.server</groupId>
+            <artifactId>kie-server-services-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.spec.javax.security.jacc</groupId>
+                    <artifactId>jboss-jacc-api_1.4_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jaxrs-api</artifactId>
+                    <groupId>org.jboss.resteasy</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>resteasy-jaxrs</artifactId>
+                    <groupId>org.jboss.resteasy</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <groupId>org.jboss.resteasy</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.server</groupId>
+            <artifactId>kie-server-rest-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.thorntail</groupId>
+            <artifactId>web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.thorntail</groupId>
+                <artifactId>thorntail-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <goals>
+                            <goal>package</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin-->
+        </plugins>
+    </build>
+
+</project>

drools-framework-thorntail-kie-server-parent/drools-framework-thorntail-jar/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  Thorntail :: Examples :: Camel CDI
+  %%
+  Copyright (C) 2016 RedHat
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
+
+<!-- Marker file indicating CDI should be enabled -->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xsi:schemaLocation="
+        http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+</beans>

drools-framework-thorntail-kie-server-parent/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pymma-jbpm-platform-parent</artifactId>
+        <groupId>com.pymmasoftware.jbpm</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>drools-framework-thorntail-kie-server-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>drools-framework-thorntail-fraction</module>
+        <module>drools-framework-thorntail-jar</module>
+    </modules>
+</project>

pom.xml

@@ -18,6 +18,7 @@
         <module>drools-framework-examples</module>
         <module>drools-framework-admin-console</module>
         <module>drools-framework-kie-wb-parent</module>
+        <module>drools-framework-thorntail-kie-server-parent</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -25,7 +26,7 @@
         <jbpm.version>7.13.0.Final</jbpm.version>
         <spring.boot.version>1.5.9.Release</spring.boot.version>
         <spring.version>4.3.3.Release</spring.version>
-        <version.thorntail>2.3.0.Final-SNAPSHOT</version.thorntail>
+        <version.thorntail>2.2.1.Final</version.thorntail>
     </properties>
 
     <build>