TSK-1826: Update to Wildfly 15.0.1

This commit is contained in:
holgerhagen 2022-03-14 15:38:29 +01:00 committed by holgerhagen
parent 6a41254009
commit b3f9a53a52
13 changed files with 453 additions and 399 deletions

View File

@ -90,8 +90,12 @@ public class SampleDataGenerator {
private void runScripts(Consumer<ScriptRunner> consumer) { private void runScripts(Consumer<ScriptRunner> consumer) {
try (Connection connection = dataSource.getConnection()) { 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(); StringWriter outWriter = new StringWriter();

View File

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

View File

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

View File

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

View File

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

View File

@ -67,7 +67,7 @@ public class AbstractAccTest {
protected String parseServerLog() throws Exception { protected String parseServerLog() throws Exception {
// TO-DO: make log4j log into rollingFile from log4j.xml // 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)); BufferedReader br = new BufferedReader(new FileReader(file));

View File

@ -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

View File

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

View File

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

View File

@ -5,8 +5,9 @@
<defaultProtocol type="Servlet 3.0"/> <defaultProtocol type="Servlet 3.0"/>
<container qualifier="jboss" default="true"> <container qualifier="jboss" default="true">
<configuration> <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
name="serverConfig">../../../../src/test/resources/int-test-standalone.xml</property>
<!-- <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m <!-- <property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
</property> --> </property> -->

View File

@ -39,10 +39,10 @@
<security-realms> <security-realms>
<security-realm name="ManagementRealm"> <security-realm name="ManagementRealm">
<authentication> <authentication>
<local default-user="$local"
skip-group-loading="true" />
<properties path="mgmt-users.properties" <properties path="mgmt-users.properties"
relative-to="jboss.server.config.dir"/> relative-to="jboss.server.config.dir"/>
<local default-user="$local"
skip-group-loading="true"/>
</authentication> </authentication>
<authorization map-groups-to-roles="false"> <authorization map-groups-to-roles="false">
<properties path="mgmt-groups.properties" <properties path="mgmt-groups.properties"
@ -60,11 +60,11 @@
</ssl> </ssl>
</server-identities> </server-identities>
<authentication> <authentication>
<local default-user="$local" allowed-users="*"
skip-group-loading="true" />
<properties <properties
path="application-users.properties" path="application-users.properties"
relative-to="jboss.server.config.dir"/> relative-to="jboss.server.config.dir"/>
<local default-user="$local" allowed-users="*"
skip-group-loading="true"/>
</authentication> </authentication>
<authorization> <authorization>
<properties <properties
@ -110,7 +110,7 @@
<profile> <profile>
<subsystem xmlns="urn:jboss:domain:logging:5.0"> <subsystem xmlns="urn:jboss:domain:logging:5.0">
<console-handler name="CONSOLE"> <console-handler name="CONSOLE">
<level name="INFO" /> <level name="ALL"/>
<formatter> <formatter>
<named-formatter <named-formatter
name="COLOR-PATTERN"/> name="COLOR-PATTERN"/>
@ -130,7 +130,7 @@
<level name="WARN"/> <level name="WARN"/>
</logger> </logger>
<logger category="org.jboss.as.config"> <logger category="org.jboss.as.config">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="sun.rmi"> <logger category="sun.rmi">
<level name="WARN"/> <level name="WARN"/>
@ -145,48 +145,48 @@
</logger> </logger>
<logger category="org.springframework.web" <logger category="org.springframework.web"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="DEBUG" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.slf4j" <logger category="org.slf4j"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="DEBUG" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.springframework.security" <logger category="org.springframework.security"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="DEBUG" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.jboss.security" <logger category="org.jboss.security"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.jboss.as.security" <logger category="org.jboss.as.security"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.picketbox" <logger category="org.picketbox"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger <logger
category="org.jboss.as.domain.management.security" category="org.jboss.as.domain.management.security"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.wildfly.security" <logger category="org.wildfly.security"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.wildfly.elytron" <logger category="org.wildfly.elytron"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.apache.catalina" <logger category="org.apache.catalina"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<logger category="org.wildfly.extension.undertow" <logger category="org.wildfly.extension.undertow"
use-parent-handlers="true"> use-parent-handlers="true">
<level name="ALL" /> <level name="INFO"/>
</logger> </logger>
<root-logger> <root-logger>
<level name="INFO"/> <level name="INFO"/>

View File

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