From 6d4877216bf57881216a0292909b099012d85538 Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <cristiano.nicolai@gmail.com>
Date: Sun, 4 Mar 2018 10:29:09 -0300
Subject: [PATCH] Upgrade supported WildFly version to 11. (#983) (#26)

* Upgrade supported WildFly version to 11.

This reverts commit 1d8f778c0c3a3d33f74d6ee659dfc35dee4ebe93.

* Clean up auth properties files comments

* fixed server logging in GWT SDM
---
 .../jbpm-wb-integration-backend/pom.xml       |  2 +-
 jbpm-wb-showcase/pom.xml                      |  7 ++++++
 .../resources/application-roles.properties    | 20 ---------------
 .../resources/application-users.properties    | 25 +------------------
 .../src/main/resources/logback.xml            |  2 +-
 .../WEB-INF/jboss-deployment-structure.xml    |  1 -
 6 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/jbpm-wb-integration/jbpm-wb-integration-backend/pom.xml b/jbpm-wb-integration/jbpm-wb-integration-backend/pom.xml
index 7587ebaf26..9fa6275b40 100644
--- a/jbpm-wb-integration/jbpm-wb-integration-backend/pom.xml
+++ b/jbpm-wb-integration/jbpm-wb-integration-backend/pom.xml
@@ -32,7 +32,7 @@
 
   <properties>
     <java.module.name>org.jbpm.wb.integration.backend</java.module.name>
-    <jboss.home>${project.build.directory}/wildfly-${version.org.wildfly.gwt.sdm}</jboss.home>
+    <jboss.home>${project.build.directory}/wildfly-${version.org.jboss.errai.wildfly}</jboss.home>
   </properties>
 
   <dependencies>
diff --git a/jbpm-wb-showcase/pom.xml b/jbpm-wb-showcase/pom.xml
index 02c62a0a6b..8f7cf7dc9e 100644
--- a/jbpm-wb-showcase/pom.xml
+++ b/jbpm-wb-showcase/pom.xml
@@ -50,6 +50,13 @@
       </exclusions>
     </dependency>
 
+    <!-- Disables WF logging subsystem in SDM -->
+    <dependency>
+      <groupId>org.kie.workbench</groupId>
+      <artifactId>kie-wb-common-wf-sdm-extensions</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- dependencies added because of new illegal transitive dependency check -->
     <dependency>
       <groupId>org.gwtbootstrap3</groupId>
diff --git a/jbpm-wb-showcase/src/main/resources/application-roles.properties b/jbpm-wb-showcase/src/main/resources/application-roles.properties
index ea61d7f1f0..12dcea525d 100644
--- a/jbpm-wb-showcase/src/main/resources/application-roles.properties
+++ b/jbpm-wb-showcase/src/main/resources/application-roles.properties
@@ -1,23 +1,3 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
 admin=admin,Administrators,kiemgmt,kie-server
 salaboy=user,admin,IT,HR,Accounting,kie-server
 maciek=user,admin,Translator,kie-server,HR,PM,IT,Accounting
diff --git a/jbpm-wb-showcase/src/main/resources/application-users.properties b/jbpm-wb-showcase/src/main/resources/application-users.properties
index 9fd652a901..179cfdd0b9 100644
--- a/jbpm-wb-showcase/src/main/resources/application-users.properties
+++ b/jbpm-wb-showcase/src/main/resources/application-users.properties
@@ -1,23 +1,3 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
 admin=207b6e0cc556d7084b5e2db7d822555c
 salaboy=d4af256e7007fea2e581d539e05edd1b
 maciek=fee266469048d89dabc31f3d11d12336
@@ -25,7 +5,4 @@ kris=0bfd0f47d4817f2557c91cbab38bb92d
 katy=fd37b5d0b82ce027bfad677a54fbccee
 john=afda4373c6021f3f5841cd6c0a027244
 jack=984ba30e11dda7b9ed86ba7b73d01481
-kieserver=16c6511893651c9b4b57e0c027a96075
-#
-#$REALM_NAME=ApplicationRealm$ This line is used by the add-user utility to identify the realm name already used in this file.
-#
+kieserver=16c6511893651c9b4b57e0c027a96075
\ No newline at end of file
diff --git a/jbpm-wb-showcase/src/main/resources/logback.xml b/jbpm-wb-showcase/src/main/resources/logback.xml
index eac598e110..337a4a7dfa 100644
--- a/jbpm-wb-showcase/src/main/resources/logback.xml
+++ b/jbpm-wb-showcase/src/main/resources/logback.xml
@@ -12,7 +12,7 @@
   <logger name="org.kie" level="info" />
   <logger name="org.jbpm" level="info" />
 
-  <root level="error">
+  <root level="info">
     <appender-ref ref="consoleAppender" />
   </root>
 
diff --git a/jbpm-wb-showcase/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/jbpm-wb-showcase/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 9524c2a6bd..09f0684763 100644
--- a/jbpm-wb-showcase/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/jbpm-wb-showcase/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -35,7 +35,6 @@
            WildFly/EAP provider for the user system management, as this webapp does by default. -->
       <module name="org.jboss.as.controller-client"/>
       <module name="org.jboss.as.domain-management"/>
-      <module name="org.jboss.sasl"/>
       <module name="org.jboss.msc"/>
       <module name="org.jboss.dmr"/>
     </dependencies>