upgrade to 7.24.0.Final

docker-compose.yaml

@@ -76,7 +76,7 @@ services:
     volumes:
       - kieserverdir:/niodir-kieserver
     environment:
-      PYMMA_OPTS: "-Dorg.kie.server.id=server1  "
+      PYMMA_OPTS: "-Dorg.kie.server.id=server1"
     hostname: proxy1.pymma
     networks:
       drools-network-dev:

drools-framework-admin-console-parent/drools-framework-admin-console/pom.xml

@@ -206,13 +206,13 @@
         <dependency>
             <groupId>com.pymmasoftware.jbpm</groupId>
             <artifactId>drools-framework-business-proxy-persistence</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.pymmasoftware.jbpm</groupId>
             <artifactId>drools-framework-business-indexer-persistence</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/restExpose/ElasticSearchExpose.java

@@ -23,7 +23,7 @@ public class ElasticSearchExpose {
     private IndexerService indexerService;
 
     @RequestMapping(value = "/findLastByTransactionId", method = RequestMethod.GET)
-    public BusinessTransactionPersistence findTransactionById(@RequestParam String transactionId, HttpServletRequest request, HttpServletResponse response) {
+    public BusinessTransactionPersistence findTransactionById(@RequestParam String transactionId,HttpServletRequest request, HttpServletResponse response) {
 
         BusinessTransactionPersistence tmp=null;
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/service/IndexerService.java

@@ -5,6 +5,7 @@ import org.chtijbug.drools.indexer.persistence.repository.BusinessTransactionPer
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.GregorianCalendar;
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/view/ActionLoggingView.java

@@ -101,7 +101,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getInputData()!=null&&b.getInputData().getRealFact()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -133,7 +133,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getFact()!=null&&b.getFact().getRealFact()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -165,7 +165,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getRuleExecution()!=null&&b.getRuleExecution().getThenFacts()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -198,7 +198,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getRuleExecution()!=null&&b.getRuleExecution().getWhenFacts()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-loyalty-model/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.pymmasoftware.jbpm</groupId>
         <artifactId>drools-framework-examples</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>drools-framework-loyalty-model</artifactId>

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-loyalty-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pymmasoftware.jbpm</groupId>
         <artifactId>drools-framework-examples</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
 

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "productManagerApp",
+  "name": "webapp",
   "version": "0.0.0",
   "dependencies": {
     "angular": "1.3.0-rc.5",

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/pom.xml

@@ -53,6 +53,17 @@
             </exclusion>
         </exclusions>
     </dependency>
+        <dependency>
+            <groupId>com.pymmasoftware.jbpm</groupId>
+            <artifactId>drools-framework-kie-server-client-connector</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
 
         <dependency>

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/docker/Dockerfile

@@ -1,11 +0,0 @@
-FROM openjdk:8-jre-slim
-
-EXPOSE 9080
-EXPOSE 8090
-ADD application.properties /application.properties
-ADD maven/swimmingpool-web.jar app.jar
-USER root
-RUN bash -c 'touch /app.jar'
-ENV JAVA_OPTS "-Dspring.config.location=file:./ "
-
-ENTRYPOINT exec java $JAVA_OPTS $PYMMA_OPTS -jar /app.jar

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/docker/application.properties

@@ -1,5 +0,0 @@
-# See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#boot-features-external-config-profile-specific-properties
-# for more details about creating profile-specific property files
-# See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#howto-initialize-a-database-using-jpa
-url.swimmingpool.calculate=http://reverse-proxy:9500/
-server.port=8080

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/Application.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 Pymma Software
+ *
+ * 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.
+ */
+package org.chtijbug.swimmingpool.web;
+
+
+import org.chtijbug.drools.generic.restclient.GenericConnexionConfiguration;
+import org.chtijbug.drools.generic.restclient.rest.UsedRestAPI;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+
+@Configuration
+@ComponentScan
+
+@EnableAutoConfiguration
+@PropertySource("classpath:application.properties")
+public class Application {
+
+    @Value(value = "${url.swimmingpool.calculate}")
+    private String url;
+    @Value(value = "${url.swimmingpool.calculate.username}")
+    private String username;
+    @Value(value = "${url.swimmingpool.calculate.password}")
+    private String password;
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Bean
+    public UsedRestAPI serviceCalculate() {
+        GenericConnexionConfiguration swimmingPoolConnexionConfiguration = new GenericConnexionConfiguration(url, username, password);
+
+        return swimmingPoolConnexionConfiguration.getGenericRestAPI();
+
+    }
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/CharacterUTF8EncodingFilter.java

@@ -0,0 +1,21 @@
+package org.chtijbug.swimmingpool.web;
+
+import org.springframework.web.filter.CharacterEncodingFilter;
+
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.annotation.WebInitParam;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Date: 20/10/14
+ * Time: 09:27
+ * To change this template use File | Settings | File Templates.
+ */
+@WebFilter(urlPatterns = {"/*"}, filterName = "CharacterEncodingFilter", initParams = {
+        @WebInitParam(name = "encoding", value = "UTF-8"),
+        @WebInitParam(name = "forceEncoding", value = "true"),
+})
+public class CharacterUTF8EncodingFilter extends CharacterEncodingFilter {
+
+
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/HomeController.java

@@ -15,19 +15,15 @@
  */
 package org.chtijbug.swimmingpool.web;
 
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.boot.SpringApplication;
+@Controller
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+public class HomeController {
 
-
+    @RequestMapping("/")
-@SpringBootApplication
+    public String home() {
-public class SwimmingPoolWebUIApplication {
+        return "index";
-
-
-
-    public static void main(String[] args) {
-        SpringApplication.run(SwimmingPoolWebUIApplication.class, args);
     }
 
-
 }

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/QuoteController.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Pymma Software
+ *
+ * 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.
+ */
+package org.chtijbug.swimmingpool.web;
+
+
+import org.chtijbug.drools.generic.restclient.rest.UsedRestAPI;
+import org.springframework.web.bind.annotation.*;
+import org.training.leisure.swimmingpool.Quote;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Date: 08/10/14
+ * Time: 10:37
+ * To change this template use File | Settings | File Templates.
+ */
+@RestController
+@RequestMapping("/quote")
+public class QuoteController {
+    @Resource
+    private UsedRestAPI serviceCalculate;
+
+    @RequestMapping(value = "/calculate/{containerId:.+}/{className:.+}", method = RequestMethod.PUT)
+    public Quote storeTicket(@PathVariable("containerId") String containerid,
+                             @PathVariable("className") String className,
+                             @RequestBody Quote quoteRequest) {
+        Quote response = null;
+        try {
+            //  response = (Quote) serviceCalculate.runSession(containerid, "swimmingpool.P000", Quote.class.getCanonicalName(), quoteRequest);
+            response = (Quote) serviceCalculate.runSession(containerid, "swimmingpool.P000", className, quoteRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return response;
+    }
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/WebInitializer.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Pymma Software
+ *
+ * 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.
+ */
+package org.chtijbug.swimmingpool.web;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Date: 07/10/14
+ * Time: 14:07
+ * To change this template use File | Settings | File Templates.
+ */
+public class WebInitializer extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(Application.class);
+    }
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/controller/QuoteController.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2014 Pymma Software
- *
- * 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.
- */
-package org.chtijbug.swimmingpool.web.controller;
-
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.RestTemplate;
-import org.training.leisure.swimmingpool.Quote;
-
-import java.util.Scanner;
-
-/**
- * Created by IntelliJ IDEA.
- * Date: 08/10/14
- * Time: 10:37
- * To change this template use File | Settings | File Templates.
- */
-@RestController
-@RequestMapping("/quote")
-public class QuoteController {
-    private static Logger logger = LoggerFactory.getLogger(QuoteController.class);
-    @Value("${url.swimmingpool.calculate}")
-    private String urlCalcul;
-    private RestTemplate restTemplateKieServer = new RestTemplate();
-    private ObjectMapper mapper = new ObjectMapper();
-
-    @RequestMapping(value = "/calculate/{containerId:.+}", method = RequestMethod.PUT)
-    public Quote storeTicket(@PathVariable("containerId") String containerid,
-                             @RequestBody Quote quoteRequest) {
-        Quote responseMoteur=null;
-        try {
-
-            String completeurl = urlCalcul+"/"+containerid;
-            logger.info("url moteur reco : " + completeurl);
-            ResponseEntity<Quote> response = restTemplateKieServer
-                    .execute(completeurl, HttpMethod.PUT, requestCallback(quoteRequest), clientHttpResponse -> {
-                        Quote extractedResponse = null;
-                        if (clientHttpResponse.getBody() != null) {
-                            Scanner s = new Scanner(clientHttpResponse.getBody()).useDelimiter("\\A");
-                            String result = s.hasNext() ? s.next() : "";
-                            extractedResponse = mapper.readValue(result, Quote.class);
-                        }
-                        ResponseEntity<Quote> extractedValue = new ResponseEntity<>(extractedResponse, clientHttpResponse.getHeaders(), clientHttpResponse.getStatusCode());
-                        return extractedValue;
-                    });
-            Quote reponseMoteur = null;
-            if (response.getBody() != null) {
-                reponseMoteur = response.getBody();
-            } else {
-                reponseMoteur = quoteRequest;
-            }
-            return reponseMoteur;
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return responseMoteur;
-    }
-    private RequestCallback requestCallback(final Quote updatedInstance) {
-        return clientHttpRequest -> {
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.writeValue(clientHttpRequest.getBody(), updatedInstance);
-            clientHttpRequest.getHeaders().add(
-                    HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
-            clientHttpRequest.getHeaders().add(
-                    HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
-        };
-    }
-}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/resources/log4j.properties

@@ -1,5 +0,0 @@
-log4j.rootLogger=debug, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%t %-5p %c{2} - %m%n

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/resources/static/js/app.js

@@ -66,8 +66,8 @@ productManagerModule.controller('quoteManagerController', function ($scope, $htt
     $scope.productSearch = "";
     $http.defaults.headers.post["Content-Type"] = "application/json";
     $scope.allSessionExecutionDetails = [];
-    $scope.containerid = "dev-pymma-nautic";
+    $scope.containerid = "dev";
-    $scope.aClassName = "";
+    $scope.aClassName = "org.training.leisure.swimmingpool.Quote";
     var _lastGoodResult = '';
     $scope.toPrettyJSON = function (objStr, tabWidth) {
         try {
@@ -107,7 +107,7 @@ productManagerModule.controller('quoteManagerController', function ($scope, $htt
 
     $scope.calculatePrice = function () {
         var myQuote = $scope.quote;
-        $http.put(urlBase + "/quote/calculate/" + $scope.containerid, myQuote).success(function (data) {
+        $http.put(urlBase + "/swimmingpool-web/quote/calculate/" + $scope.containerid + "/" + $scope.aClassName, myQuote).success(function (data) {
             $scope.quoteResult = data;
             $scope.allSessionExecutionDetails = JSON.parse(data.sessionLogging);
             $scope.sessionLogging = JSON.stringify($scope.allSessionExecutionDetails, null, 3);

drools-framework-base-tools-parent/drools-framework-kie-server-parent/drools-framework-kie-server-rest-drools/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>drools-framework-kie-server-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-kie-server-parent/drools-framework-kie-server-webapp/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>drools-framework-kie-server-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>drools-framework-kie-server-webapp</artifactId>

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

@@ -13,6 +13,7 @@
         <module>drools-framework-kie-server-services-drools</module>
         <module>drools-framework-kie-server-client-connector</module>
         <module>drools-framework-kie-server-extension-interface</module>
+        <module>drools-framework-kie-server-rest-drools</module>
     </modules>
 
 

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

@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+  <!--
+  <distributable/>
+  -->
+  <listener>
+    <listener-class>org.uberfire.backend.server.io.DisposableShutdownService</listener-class>
+  </listener>
+
+  <listener>
+    <listener-class>org.kie.workbench.screens.workbench.backend.SwaggerAPIScanner</listener-class>
+  </listener>
+
+  <servlet-mapping>
+    <servlet-name>javax.ws.rs.core.Application</servlet-name>
+    <url-pattern>/rest/*</url-pattern>
+  </servlet-mapping>
+
+  <context-param>
+    <param-name>resteasy.role.based.security</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
+  <filter>
+    <filter-name>request-capture</filter-name>
+    <filter-class>org.uberfire.ext.security.server.SecurityIntegrationFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>request-capture</filter-name>
+    <url-pattern>*</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>Cache Filter</filter-name>
+    <filter-class>org.uberfire.ext.security.server.CacheHeadersFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>Cache Filter</filter-name>
+    <url-pattern>/kie-wb.jsp</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>Cache Filter</filter-name>
+    <url-pattern>*.js</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>Host Page Patch</filter-name>
+    <filter-class>org.jboss.errai.security.server.servlet.UserHostPageFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>Host Page Patch</filter-name>
+    <url-pattern>/kie-wb.jsp</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>CSRF Token Filter</filter-name>
+    <filter-class>org.jboss.errai.bus.server.servlet.CSRFTokenFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>CSRF Token Filter</filter-name>
+    <url-pattern>/kie-wb.jsp</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>GWT Locale Filter</filter-name>
+    <filter-class>org.uberfire.server.locale.GWTLocaleHeaderFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>GWT Locale Filter</filter-name>
+    <url-pattern>/kie-wb.jsp</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>UberFire Security Headers Filter</filter-name>
+    <filter-class>org.uberfire.ext.security.server.SecureHeadersFilter</filter-class>
+    <init-param>
+      <param-name>x-frame-options</param-name>
+      <param-value>SAMEORIGIN</param-value>
+    </init-param>
+    <init-param>
+      <param-name>x-xss-protection-enable</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>x-xss-protection-block</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>UberFire Security Headers Filter</filter-name>
+    <url-pattern>*</url-pattern>
+  </filter-mapping>
+
+  <servlet>
+    <servlet-name>LoginRedirectServlet</servlet-name>
+    <servlet-class>org.uberfire.ext.security.server.LoginRedirectServlet</servlet-class>
+    <init-param>
+      <param-name>display-after-login</param-name>
+      <param-value>/kie-wb.jsp</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>LoginRedirectServlet</servlet-name>
+    <url-pattern>/login</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+  <filter>
+    <filter-name>GzipFilter</filter-name>
+    <filter-class>org.uberfire.backend.server.util.gzip.GzipFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>GzipFilter</filter-name>
+    <url-pattern>*.js</url-pattern>
+  </filter-mapping>
+
+  <!-- drools-wb servlets -->
+  <servlet>
+    <servlet-name>DTableXLSFileServlet</servlet-name>
+    <servlet-class>org.drools.workbench.screens.dtablexls.backend.server.DecisionTableXLSFileServlet</servlet-class>
+    <init-param>
+      <param-name>includes-path</param-name>
+      <param-value>git://**,default://**</param-value>
+    </init-param>
+    <init-param>
+      <param-name>excludes-path</param-name>
+      <param-value>file://**</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DTableXLSFileServlet</servlet-name>
+    <url-pattern>/org.kie.bc.KIEWebapp/dtablexls/file</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ArchiveServlet</servlet-name>
+    <servlet-class>org.guvnor.common.services.backend.archive.ArchiveServlet</servlet-class>
+    <init-param>
+      <param-name>includes-path</param-name>
+      <param-value>git://**,default://**</param-value>
+    </init-param>
+    <init-param>
+      <param-name>excludes-path</param-name>
+      <param-value>file://**</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ArchiveServlet</servlet-name>
+    <url-pattern>/org.kie.bc.KIEWebapp/archive</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ScoreCardFileServlet</servlet-name>
+    <servlet-class>org.drools.workbench.screens.scorecardxls.backend.server.ScoreCardXLSFileServlet</servlet-class>
+    <init-param>
+      <param-name>includes-path</param-name>
+      <param-value>git://**,default://**</param-value>
+    </init-param>
+    <init-param>
+      <param-name>excludes-path</param-name>
+      <param-value>file://**</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ScoreCardFileServlet</servlet-name>
+    <url-pattern>/org.kie.bc.KIEWebapp/scorecardxls/file</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UberfireFileUploadServlet</servlet-name>
+    <servlet-class>org.uberfire.server.FileUploadServlet</servlet-class>
+    <init-param>
+      <param-name>includes-path</param-name>
+      <param-value>git://**,default://**</param-value>
+    </init-param>
+    <init-param>
+      <param-name>excludes-path</param-name>
+      <param-value>file://**</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UberfireFileUploadServlet</servlet-name>
+    <url-pattern>/org.kie.bc.KIEWebapp/defaulteditor/upload/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UberfireFileDownloadServlet</servlet-name>
+    <servlet-class>org.uberfire.server.FileDownloadServlet</servlet-class>
+    <init-param>
+      <param-name>includes-path</param-name>
+      <param-value>git://**,default://**</param-value>
+    </init-param>
+    <init-param>
+      <param-name>excludes-path</param-name>
+      <param-value>file://**</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UberfireFileDownloadServlet</servlet-name>
+    <url-pattern>/org.kie.bc.KIEWebapp/defaulteditor/download/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>M2Servlet</servlet-name>
+    <servlet-class>org.guvnor.m2repo.backend.server.M2Servlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>M2Servlet</servlet-name>
+    <url-pattern>/maven2/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>VerifierWebWorkerServlet</servlet-name>
+    <servlet-class>org.kie.workbench.common.services.verifier.service.VerifierWebWorkerServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>VerifierWebWorkerServlet</servlet-name>
+    <url-pattern>/verifier/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PluginMediaServlet</servlet-name>
+    <servlet-class>org.uberfire.ext.plugin.backend.PluginMediaServlet</servlet-class>
+    <init-param>
+      <param-name>url-pattern</param-name>
+      <param-value>/plugins/</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PluginMediaServlet</servlet-name>
+    <url-pattern>/plugins/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- Errai servlets -->
+  <servlet>
+    <!-- NOTE: the integration-test profile uses this web.xml. Integration tests only work properly
+with the DefaultBlockingServlet. If you change this setting, make a backup of this web.xml
+(perhaps under src/integration-test-settings/web.xml and alter the integration-test
+profile in pom.xml to use that. -->
+    <servlet-name>ErraiServlet</servlet-name>
+    <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>ErraiServlet</servlet-name>
+    <url-pattern>*.erraiBus</url-pattern>
+  </servlet-mapping>
+
+  <!-- Start jBPM Designer -->
+  <filter>
+    <filter-name>Redirect Filter</filter-name>
+    <filter-class>org.jbpm.designer.filter.DesignerResourcesRedirectFilter</filter-class>
+    <init-param>
+      <param-name>redirectTo</param-name>
+      <param-value>/org.kie.bc.KIEWebapp</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>Redirect Filter</filter-name>
+    <url-pattern>/org.jbpm.designer.jBPMDesigner/*</url-pattern>
+  </filter-mapping>
+  <!-- the number within the session-timout element must be expressed in
+minutes. it is now 24 hours. -->
+  <session-config>
+    <session-timeout>1440</session-timeout>
+    <cookie-config>
+      <http-only>true</http-only>
+    </cookie-config>
+  </session-config>
+  <!-- jBoss' default mapping is to "image/svg", which causes the client
+not to parse the SVG content as XML. However, the Oryx Editor client relies
+on that behaviour. The mimetype as per W3C specification must be "image/svg+xml".
+See http://www.w3.org/TR/SVG/intro.html#MIMEType. -->
+  <mime-mapping>
+    <extension>svg</extension>
+    <mime-type>image/svg+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>json</extension>
+    <mime-type>application/json</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>css</extension>
+    <mime-type>text/css</mime-type>
+  </mime-mapping>
+  <!-- Set Favourites Icon MIME-Type -->
+  <mime-mapping>
+    <extension>ico</extension>
+    <mime-type>image/x-icon</mime-type>
+  </mime-mapping>
+  <!-- End jBPM Designer -->
+
+  <!-- security settings -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>download</web-resource-name>
+      <url-pattern>/org.kie.bc.KIEWebapp/archive</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/defaulteditor/upload/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/defaulteditor/download/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/dtablexls/file</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/scorecardxls/file</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>admin</role-name>
+      <role-name>analyst</role-name>
+      <role-name>developer</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>console</web-resource-name>
+      <url-pattern>/kie-wb.jsp</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/*</url-pattern>
+      <url-pattern>*.erraiBus</url-pattern>
+      <url-pattern>/resourceList</url-pattern>
+      <url-pattern>/editor</url-pattern>
+      <url-pattern>/editor/*</url-pattern>
+      <url-pattern>/menuconnector/*</url-pattern>
+      <url-pattern>/menu/*</url-pattern>
+      <url-pattern>/uuidRepository</url-pattern>
+      <url-pattern>/transformer</url-pattern>
+      <url-pattern>/assetservice</url-pattern>
+      <url-pattern>/filestore</url-pattern>
+      <url-pattern>/dictionary</url-pattern>
+      <url-pattern>/themes</url-pattern>
+      <url-pattern>/customeditors</url-pattern>
+      <url-pattern>/simulation</url-pattern>
+      <url-pattern>/formwidget</url-pattern>
+      <url-pattern>/calledelement</url-pattern>
+      <url-pattern>/stencilpatterns</url-pattern>
+      <url-pattern>/jbpmservicerepo</url-pattern>
+      <url-pattern>/processdiff</url-pattern>
+      <url-pattern>/taskforms</url-pattern>
+      <url-pattern>/taskformseditor</url-pattern>
+      <url-pattern>/processinfo</url-pattern>
+      <url-pattern>/syntaxcheck</url-pattern>
+      <url-pattern>/plugins</url-pattern>
+      <url-pattern>/plugin</url-pattern>
+      <url-pattern>/plugin/*</url-pattern>
+      <url-pattern>/stencilset/*</url-pattern>
+      <url-pattern>/plugins/*</url-pattern>
+      <url-pattern>/verifier/*</url-pattern>
+      <url-pattern>/docs/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>admin</role-name>
+      <role-name>analyst</role-name>
+      <role-name>developer</role-name>
+      <role-name>user</role-name>
+      <role-name>manager</role-name>
+      <role-name>process-admin</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <!-- public resources -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>public</web-resource-name>
+      <url-pattern>/org.kie.bc.KIEWebapp/ace/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/bootstrap-daterangepicker/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/bootstrap-select/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/css/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/deferredjs/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/fonts/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/img/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/images/*</url-pattern>
+      <url-pattern>/org.kie.bc.KIEWebapp/zeroclipboard/*</url-pattern>
+      <url-pattern>/rest/ready</url-pattern>
+      <url-pattern>/rest/healthy</url-pattern>
+      <url-pattern>/maven2/*</url-pattern>
+    </web-resource-collection>
+  </security-constraint>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>remote-services</web-resource-name>
+      <url-pattern>/rest/*</url-pattern>
+      <url-pattern>/ws/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>rest-all</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+
+
+
+  <login-config>
+    <auth-method>BASIC?silent=true,FORM</auth-method>
+    <form-login-config>
+      <form-login-page>/login.jsp</form-login-page>
+      <form-error-page>/login.jsp?message=Login failed: Invalid UserName or Password</form-error-page>
+    </form-login-config>
+  </login-config>
+
+  <security-role>
+    <description>Administrator - Administrates the BPMS system. Has full access
+      rights to make any changes necessary. Also has the
+      ability to add and remove users from the system.
+    </description>
+    <role-name>admin</role-name>
+  </security-role>
+
+  <security-role>
+    <description>Analyst - Responsible for creating and designing processes
+      into the system. Creates process flows and handles
+      process change requests. Needs to test processes that
+      they create. Also creates forms and dashboards.
+    </description>
+    <role-name>analyst</role-name>
+  </security-role>
+
+  <security-role>
+    <description>Developer - Implements code required for process to work. Mostly uses
+      the JBDS connection to view processes, but may use the
+      web tool occasionally.
+    </description>
+    <role-name>developer</role-name>
+  </security-role>
+
+  <security-role>
+    <description>Business user - Daily user of the system to take actions on business tasks
+      that are required for the processes to continue forward. Works
+      primarily with the task lists.
+    </description>
+    <role-name>user</role-name>
+  </security-role>
+
+  <security-role>
+    <description>Manager/Viewer-only User - Viewer of the system that is interested in statistics
+      around the business processes and their performance, business indicators, and other
+      reporting of the system and people who interact with the system.
+    </description>
+    <role-name>manager</role-name>
+  </security-role>
+
+  <security-role>
+    <description>Process Administrator - can access and manage the process related activities like process
+      definitions and process instances.
+    </description>
+    <role-name>process-admin</role-name>
+  </security-role>
+
+  <error-page>
+    <error-code>403</error-code>
+    <location>/not_authorized.jsp</location>
+  </error-page>
+
+</web-app>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/drools-framework-kie-server-chtijbug-drools-springboot-jar/pom.xml

@@ -11,12 +11,11 @@
 
     <artifactId>drools-framework-kie-server-chtijbug-drools-springboot-jar</artifactId>
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-server-spring-boot-starter-drools</artifactId>
             <version>${jbpm.version}</version>
-        </dependency>
+        </dependency-->
-        <!-- https://mvnrepository.com/artifact/org.kie/kie-server-spring-boot-starter-drools -->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/drools-framework-kie-server-springboot-autoconfigure-drools/pom.xml

@@ -126,7 +126,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.pymmasoftware.jbpm</groupId>
+            <artifactId>drools-framework-kie-server-rest-drools</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
 
     </dependencies>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/pom.xml

@@ -8,6 +8,7 @@
         <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>drools-framework-spring-boot-parent</artifactId>
     <packaging>pom</packaging>
 
     <properties>
@@ -16,10 +17,10 @@
     </properties>
     <modules>
         <module>drools-framework-kie-server-springboot-autoconfigure-drools</module>
-        <module>drools-framework-kie-server-chtijbug-drools-springboot-jar</module>
+        <!--module>drools-framework-kie-server-chtijbug-drools-springboot-jar</module-->
 
     </modules>
-    <artifactId>drools-framework-spring-boot-parent</artifactId>
+
 
 
 </project>

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

@@ -131,7 +131,7 @@
     <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.29.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.29.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="module" module-name="drools-framewwork-business-proxy-persistence" />
+    <orderEntry type="module" module-name="drools-framework-business-proxy-persistence" />
     <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.mongodb:mongodb-driver:3.8.2" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:bson:3.8.2" level="project" />
@@ -147,8 +147,8 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
     <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: org.kie:kie-internal:7.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.24.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-api:7.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-api:7.24.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.24.0.Final" level="project" />
   </component>
 </module>

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

@@ -92,8 +92,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.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-internal:7.24.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie:kie-api:7.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie:kie-api:7.24.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.19.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.kie.soup:kie-soup-maven-support:7.24.0.Final" level="project" />
   </component>
 </module>

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

@@ -25,7 +25,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="drools-framewwork-business-proxy-persistence" />
+    <orderEntry type="module" module-name="drools-framework-business-proxy-persistence" />
     <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.mongodb:mongodb-driver:3.8.2" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:bson:3.8.2" level="project" />