TSK-1826: Update to Wildfly 15.0.1

common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java

@@ -90,8 +90,12 @@ public class SampleDataGenerator {
 
   private void runScripts(Consumer<ScriptRunner> consumer) {
     try (Connection connection = dataSource.getConnection()) {
-      if (LOGGER.isTraceEnabled()) {
+      if (LOGGER.isDebugEnabled()) {
-        LOGGER.trace(connection.getMetaData().toString());
+        LOGGER.debug(
+            "Generating sample data for database of type '{}' with url '{}' and schema '{}'.",
+            connection.getMetaData().getDatabaseProductName(),
+            connection.getMetaData().getURL(),
+            schema);
       }
 
       StringWriter outWriter = new StringWriter();

pom.xml

@@ -69,7 +69,7 @@
     <version.spring.mybatis>2.0.7</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
-    <version.wildfly>13.0.0.Final</version.wildfly>
+    <version.wildfly>15.0.1.Final</version.wildfly>
 
     <!-- camunda dependencies -->
     <version.camunda.dmn>7.16.0</version.camunda.dmn>

rest/pom.xml

@@ -21,6 +21,7 @@
     <module>../web</module>
     <module>taskana-rest-spring-example-common</module>
     <module>taskana-rest-spring-example-boot</module>
+    <module>taskana-rest-spring-example-wildfly</module>
   </modules>
 
 </project>

rest/taskana-rest-spring-example-wildfly/pom.xml

@@ -23,7 +23,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-javaee7</artifactId>
+        <artifactId>wildfly-javaee8</artifactId>
         <version>${version.wildfly}</version>
         <scope>import</scope>
         <type>pom</type>

rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/example/wildfly/TaskanaWildflyConfiguration.java

@@ -64,6 +64,9 @@ public class TaskanaWildflyConfiguration {
       Properties properties = new Properties();
       ctx = new InitialContext();
       properties.load(propertyStream);
+      LOGGER.debug(
+          "TASKANA is using datasource '{}' from application.properties.",
+          properties.getProperty("datasource.jndi"));
       dataSource = (DataSource) ctx.lookup(properties.getProperty("datasource.jndi"));
       return dataSource;
     } catch (Exception e) {

rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java

@@ -67,7 +67,7 @@ public class AbstractAccTest {
   protected String parseServerLog() throws Exception {
 
     // TO-DO: make log4j log into rollingFile from log4j.xml
-    File file = new File("target/wildfly-13.0.0.Final/standalone/log/server.log");
+    File file = new File("target/wildfly-15.0.1.Final/standalone/log/server.log");
 
     BufferedReader br = new BufferedReader(new FileReader(file));
 

rest/taskana-rest-spring-example-wildfly/src/test/resources/application-h2.properties

@@ -0,0 +1,51 @@
+######## Taskana DB #######
+datasource.jndi=java:/TaskanaDS/H2
+taskana.schemaName=TASKANA
+devMode=true
+
+####### properties to connect to LDAP
+taskana.ldap.serverUrl=ldap://localhost:10389
+taskana.ldap.bindDn=uid=admin
+taskana.ldap.bindPassword=secret
+taskana.ldap.baseDn=ou=Test,O=TASKANA
+taskana.ldap.userSearchBase=cn=users
+taskana.ldap.userSearchFilterName=objectclass
+taskana.ldap.userSearchFilterValue=person
+taskana.ldap.userFirstnameAttribute=givenName
+taskana.ldap.userLastnameAttribute=sn
+taskana.ldap.userFullnameAttribute=cn
+taskana.ldap.userPhoneAttribute=phoneNumber
+taskana.ldap.userMobilePhoneAttribute=mobileNumber
+taskana.ldap.userEmailAttribute=email
+taskana.ldap.userOrglevel1Attribute=orgLevel1
+taskana.ldap.userOrglevel2Attribute=orgLevel2
+taskana.ldap.userOrglevel3Attribute=someDepartement
+taskana.ldap.userOrglevel4Attribute=orgLevel4
+taskana.ldap.userIdAttribute=uid
+taskana.ldap.userMemberOfGroupAttribute=memberOf
+taskana.ldap.groupSearchBase=
+taskana.ldap.groupSearchFilterName=objectclass
+taskana.ldap.groupSearchFilterValue=groupOfUniqueNames
+taskana.ldap.groupNameAttribute=cn
+taskana.ldap.minSearchForLength=3
+taskana.ldap.maxNumberOfReturnedAccessIds=50
+taskana.ldap.groupsOfUser=uniquemember
+
+####### JobScheduler cron expression that specifies when the JobSchedler runs
+taskana.jobscheduler.async.cron=0 * * * * *
+
+####### cache static resources propertiesgit add --
+spring.resources.cache.cachecontrol.cache-private=true
+spring.main.allow-bean-definition-overriding=true
+
+####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy
+server.tomcat.remoteip.internal-proxies=.*
+server.forward-headers-strategy=native
+
+# Embedded Spring LDAP server
+spring.ldap.embedded.base-dn=OU=Test,O=TASKANA
+spring.ldap.embedded.credential.username=uid=admin
+spring.ldap.embedded.credential.password=secret
+spring.ldap.embedded.ldif=classpath:taskana-test.ldif
+spring.ldap.embedded.port=10389
+spring.ldap.embedded.validation.enabled=false

rest/taskana-rest-spring-example-wildfly/src/test/resources/application-postgres.properties

@@ -1,6 +1,3 @@
-logging.level.pro.taskana=DEBUG
-logging.level.org.springframework=DEBUG
-
 ######## Taskana DB #######
 datasource.jndi=java:/TaskanaDS/PostgreSQL
 taskana.schemaName=taskana

rest/taskana-rest-spring-example-wildfly/src/test/resources/application.properties

@@ -1,9 +1,6 @@
-logging.level.pro.taskana=DEBUG
-logging.level.org.springframework=DEBUG
-
 ######## Taskana DB #######
-datasource.jndi=java:/TaskanaDS/H2
+datasource.jndi=java:/TaskanaDS/PostgreSQL
-taskana.schemaName=TASKANA
+taskana.schemaName=taskana
 
 devMode=true
 
@@ -47,9 +44,9 @@ server.tomcat.remoteip.internal-proxies=.*
 server.forward-headers-strategy=native
 
 # Embedded Spring LDAP server
-spring.ldap.embedded.base-dn= OU=Test,O=TASKANA
+spring.ldap.embedded.base-dn=OU=Test,O=TASKANA
-spring.ldap.embedded.credential.username= uid=admin
+spring.ldap.embedded.credential.username=uid=admin
-spring.ldap.embedded.credential.password= secret
+spring.ldap.embedded.credential.password=secret
 spring.ldap.embedded.ldif=classpath:taskana-test.ldif
-spring.ldap.embedded.port= 10389
+spring.ldap.embedded.port=10389
 spring.ldap.embedded.validation.enabled=false

rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml

@@ -1,16 +1,17 @@
 <arquillian xmlns="http://jboss.org/schema/arquillian"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://jboss.org/schema/arquillian
+            xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-    <defaultProtocol type="Servlet 3.0" />
+    <defaultProtocol type="Servlet 3.0"/>
     <container qualifier="jboss" default="true">
         <configuration>
-            <property name="jbossHome">target/wildfly-13.0.0.Final</property>
+            <property name="jbossHome">target/wildfly-15.0.1.Final</property>
-            <property name="serverConfig">../../../../src/test/resources/int-test-standalone.xml</property>
+            <property
-<!--             <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m
+              name="serverConfig">../../../../src/test/resources/int-test-standalone.xml</property>
-                -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
+          <!--             <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m
-            </property> -->
+                          -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
-            <property name="javaVmArguments">-Djava.util.logging.manager=org.jboss.logmanager.LogManager</property>
+                      </property> -->
+          <property name="javaVmArguments">-Djava.util.logging.manager=org.jboss.logmanager.LogManager</property>
         </configuration>
     </container>
 </arquillian>

rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-web.xml

@@ -1,7 +1,7 @@
 <web-app version="3.1"
-    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
   http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
 
     <display-name>TaskanaRestWildflySpring</display-name>
@@ -29,7 +29,7 @@
             <url-pattern>/img/logo.png</url-pattern>
             <url-pattern>/logout</url-pattern>
         </web-resource-collection>
-        <!-- No auth-constraint means everybody has access! -->
+      <!-- No auth-constraint means everybody has access! -->
     </security-constraint>
     <security-role>
         <role-name>*</role-name>

rest/taskana-rest-spring-example-wildfly/src/test/resources/module.xml

@@ -2,13 +2,13 @@
 
 <module xmlns="urn:jboss:module:1.1" name="org.postgresql">
 
-    <resources>
-    <!--the name of your driver -->
-        <resource-root path="postgresql-42.3.1.jar"/>
-    </resources>
-
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
     </dependencies>
+
+    <resources>
+    <!--the name of your driver -->
+      <resource-root path="postgresql-42.3.3.jar"/>
+    </resources>
 </module>