Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r4a13950e9817d6f085eba22ec4d685a7a09a36fc -ra1064a52a646aa043ea1fe371726537fd305c5de
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 4a13950e9817d6f085eba22ec4d685a7a09a36fc)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<server xmlns="urn:jboss:domain:8.0">
+<server xmlns="urn:jboss:domain:20.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -18,45 +18,28 @@
         <extension module="org.jboss.as.pojo"/>
         <extension module="org.jboss.as.remoting"/>
         <extension module="org.jboss.as.sar"/>
-        <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
         <extension module="org.wildfly.extension.batch.jberet"/>
         <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.clustering.ejb"/>
+        <extension module="org.wildfly.extension.clustering.web"/>
         <extension module="org.wildfly.extension.core-management"/>
         <extension module="org.wildfly.extension.discovery"/>
         <extension module="org.wildfly.extension.ee-security"/>
         <extension module="org.wildfly.extension.elytron"/>
+        <extension module="org.wildfly.extension.elytron-oidc-client"/>
+        <extension module="org.wildfly.extension.health"/>
         <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.metrics"/>
         <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
     <management>
-        <security-realms>
-            <security-realm name="ManagementRealm">
-                <authentication>
-                    <local default-user="$local" skip-group-loading="true"/>
-                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-                <authorization map-groups-to-roles="false">
-                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
-                </authorization>
-            </security-realm>
-            <security-realm name="ApplicationRealm">
-                <authentication>
-                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
-                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-                <authorization>
-                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
-                </authorization>
-            </security-realm>
-        </security-realms>
         <audit-log>
             <formatters>
                 <json-formatter name="json-formatter"/>
@@ -71,8 +54,8 @@
             </logger>
         </audit-log>
         <management-interfaces>
-            <http-interface security-realm="ManagementRealm">
-                <http-upgrade enabled="true"/>
+            <http-interface http-authentication-factory="management-http-authentication">
+                <http-upgrade enabled="true" sasl-authentication-factory="management-sasl-authentication"/>
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
@@ -87,31 +70,29 @@
         </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:6.0">
-        	<use-deployment-logging-config value="false" />
+        <subsystem xmlns="urn:jboss:domain:logging:8.0">
+            <use-deployment-logging-config value="false" />
             <add-logging-api-dependencies value="true" />
-        	
-            <periodic-rotating-file-handler name="FILE"
-                autoflush="true">
-                <formatter>
-                    <named-formatter name="PATTERN" />
-                </formatter>
-                <file relative-to="jboss.server.log.dir" path="server.log" />
-                <suffix value="'.'yyyy-MM-dd" />
-                <append value="true" />
 
-            </periodic-rotating-file-handler>
-
             <console-handler name="CONSOLE">
-                <target name="System.out" />
-                <level name="INFO" />
+            <!-- <target name="System.out" />-->
+                <level name="INFO"/>
                 <formatter>
-                    <named-formatter name="CONSOLEPATTERN" />
+                    <named-formatter name="COLOR-PATTERN"/>
                 </formatter>
             </console-handler>
 
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+
             <size-rotating-file-handler name="LAMSFILE"
-                autoflush="true">
+                                        autoflush="true">
                 <level name="DEBUG" />
                 <formatter>
                     <named-formatter name="LAMSPATTERN" />
@@ -131,7 +112,7 @@
             </console-handler>
 
             <size-rotating-file-handler name="HIBERNATEFILE"
-                autoflush="true">
+                                        autoflush="true">
                 <level name="DEBUG" />
                 <formatter>
                     <named-formatter name="HIBERNATEPATTERN" />
@@ -141,9 +122,9 @@
                 <max-backup-index value="20" />
                 <append value="true" />
             </size-rotating-file-handler>
-            
+
             <periodic-rotating-file-handler name="LAMSAUDIT"
-                autoflush="true">
+                                            autoflush="true">
                 <formatter>
                     <named-formatter name="LAMSAUDITPATTERN" />
                 </formatter>
@@ -152,247 +133,218 @@
                 <append value="true" />
             </periodic-rotating-file-handler>
 
-            <!-- ISO8601 date format -->
-            <formatter name="HIBERNATEPATTERN">
-                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c - %m%n" />
-            </formatter>
-            <formatter name="LAMSCONSOLEPATTERN">
-                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
-            </formatter>
-            <formatter name="LAMSPATTERN">
-                <pattern-formatter
-                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
-            </formatter>
-            <formatter name="LAMSAUDITPATTERN">
-                <pattern-formatter
-                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %m%n" />
-            </formatter>
-            
-            <!-- ABSOLUTE date format -->
-            <formatter name="CONSOLEPATTERN">
-                <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
-            </formatter>
-            <formatter name="PATTERN">
-                <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n" />
-            </formatter>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="com.networknt.schema">
+                <level name="WARN"/>
+            </logger>
+            <logger category="io.jaegertracing.Configuration">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
 
             <logger category="org.lamsfoundation.lams"
-                use-parent-handlers="false">
+                    use-parent-handlers="false">
                 <level name="DEBUG" />
                 <handlers>
                     <handler name="LAMSFILE" />
                     <handler name="LAMSCONSOLE" />
                 </handlers>
             </logger>
-
-            <logger category="org.wildfly" use-parent-handlers="false">
-                <level name="DEBUG" />
-                <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-
             <logger category="org.hibernate"
-            	use-parent-handlers="false">
+                    use-parent-handlers="false">
                 <level name="INFO" />
                 <handlers>
                     <handler name="HIBERNATEFILE" />
                 </handlers>
             </logger>
-
-            <logger category="org.springframework.beans.factory.support.DefaultListableBeanFactory">
-            	<level name="INFO"/>
-            </logger>
-            
-            <logger category="org.lamsfoundation.lams.context">
-            	<level name="INFO"/>
-            </logger>
-            
-            <logger category="org.lamsfoundation.lams.util.hibernate.TransactionAwareSessionContext">
-            	<level name="ERROR"/>
-            </logger>
-            
-            <logger category="org.hibernate.engine.internal.StatefulPersistenceContext">
-                <level name="ERROR"/>
-            </logger>
-            
-             <logger category="org.hibernate.hql.internal.ast.HqlSqlWalker">
-                <level name="ERROR"/>
-            </logger>
-            
-            <logger category="org.jboss">
-                <level name="INFO" />
-            </logger>
-
-            <logger category="org.apache">
-                <level name="INFO" />
-            </logger>
-
-            <logger category="jacorb">
-                <level name="WARN" />
-            </logger>
-
-            <logger category="javax.enterprise.resource.webcontainer.jsf">
-                <level name="INFO" />
-            </logger>
-
-            <logger category="org.jgroups">
-                <level name="WARN" />
-            </logger>
-
-            <logger category="org.quartz">
-                <level name="INFO" />
-            </logger>
-
-            <logger category="org.jboss.management">
-                <level name="INFO" />
-            </logger>
-
-            <logger category="org.jboss.serial">
-                <level name="INFO" />
-            </logger>
-            
-            <logger category="org.springframework.transaction.jta">
-                <level name="INFO"/>
-            </logger>
-            
-            <logger category="org.springframework.orm.hibernate5">
-                <level name="INFO"/>
-            </logger>
-            
-            <logger category="org.springframework.beans.factory.annotation">
-                <level name="WARN"/>
-            </logger>
-            
-            <logger category="org.hibernate.engine.internal.StatisticalLoggingSessionEventListener">
-            	<level name="WARN"/>
-            </logger>
-           
-            <logger category="Owasp.CsrfGuard" use-parent-handlers="false">
-                <level name="WARN" />
-                <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-            
-            <logger category="org.owasp.csrfguard" use-parent-handlers="false">
-                <level name="WARN" />
-                <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-            
             <logger category="org.lamsfoundation.lams.web.filter.AuditLogFilter" use-parent-handlers="false">
                 <level name="INFO" />
                 <handlers>
                     <handler name="LAMSAUDIT" />
                 </handlers>
             </logger>
-            
-            <!-- On production change below settings to INFO -->
-            
-           	 <logger category="io.undertow.request">
+
+            <root-logger>
                 <level name="DEBUG"/>
-            </logger>
-            
-            <logger category="org.springframework.web">
-                <level name="DEBUG"/>
-            </logger>
-            
-            <logger category="org.hibernate.cache.internal.QueryResultsCacheImpl"
-            	use-parent-handlers="false">
-                <level name="DEBUG" />
                 <handlers>
-                    <handler name="HIBERNATEFILE" />
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
                 </handlers>
-            </logger>
-            
-            <!-- On production change above settings to INFO -->
-            
-            <root-logger>
-                <level name="DEBUG" />
-                <handlers>
-                    <handler name="CONSOLE" />
-                    <handler name="FILE" />
-                </handlers>
             </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <!-- ISO8601 date format -->
+            <formatter name="HIBERNATEPATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c - %m%n" />
+            </formatter>
+            <formatter name="LAMSCONSOLEPATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+            </formatter>
+            <formatter name="LAMSPATTERN">
+                <pattern-formatter
+                        pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
+            </formatter>
+            <formatter name="LAMSAUDITPATTERN">
+                <pattern-formatter
+                        pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %m%n" />
+            </formatter>
+            <!-- ABSOLUTE date format -->
+            <formatter name="CONSOLEPATTERN">
+                <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+            </formatter>
         </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
+            <default-job-repository name="in-memory"/>
+            <default-thread-pool name="batch"/>
+            <security-domain name="ApplicationDomain"/>
+            <job-repository name="in-memory">
+                <in-memory/>
+            </job-repository>
+            <thread-pool name="batch">
+                <max-threads count="10"/>
+                <keepalive-time time="30" unit="seconds"/>
+            </thread-pool>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
         <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
+        <subsystem xmlns="urn:jboss:domain:datasources:7.1">
             <datasources>
-				<datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true" statistics-enabled="true">
-				    <connection-url>@db.url.run@</connection-url>
-				    <driver>MySQL</driver>
-				    <connection-property name="characterEncoding">utf8</connection-property>
-				    <connection-property name="useUnicode">true</connection-property>
-				    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
-				    <connection-property name="useSSL">false</connection-property>
-				    <connection-property name="autoReconnect">true</connection-property>
-				    <connection-property name="allowPublicKeyRetrieval">true</connection-property>
-				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
-				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
-				    
-				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-				    <pool>
-				      <min-pool-size>0</min-pool-size>
-				      <initial-pool-size>0</initial-pool-size>
-				      <max-pool-size>64</max-pool-size>
-				      <prefill>false</prefill>
-				      <use-strict-min>false</use-strict-min>
-				      <flush-strategy>FailingConnectionOnly</flush-strategy>
-				    </pool>
-				    <security>
-				      <user-name>@db.username@</user-name>
-				      <password>@db.password@</password>
-				    </security>
-				    <validation>
-				      <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-				      <validate-on-match>true</validate-on-match>
-				      <background-validation>false</background-validation>
-				      <use-fast-fail>false</use-fast-fail>
-				    </validation>
-				    <timeout>
-				      <idle-timeout-minutes>5</idle-timeout-minutes>
-				      <xa-resource-timeout>0</xa-resource-timeout>
-				    </timeout>
-				    <statement>
-				      <track-statements>false</track-statements>
-				    </statement>
-			  	</datasource>
-			  
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true" statistics-enabled="true">
+                    <connection-url>@db.url.run@</connection-url>
+                    <driver>MySQL</driver>
+                    <connection-property name="characterEncoding">utf8</connection-property>
+                    <connection-property name="useUnicode">true</connection-property>
+                    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
+                    <connection-property name="useSSL">false</connection-property>
+                    <connection-property name="autoReconnect">true</connection-property>
+                    <connection-property name="allowPublicKeyRetrieval">true</connection-property>
+                    <connection-property name="useLegacyDatetimeCode">false</connection-property>
+                    <connection-property name="serverTimezone">@db.timezone@</connection-property>
+
+                    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+                    <pool>
+                        <min-pool-size>0</min-pool-size>
+                        <initial-pool-size>0</initial-pool-size>
+                        <max-pool-size>64</max-pool-size>
+                        <prefill>false</prefill>
+                        <use-strict-min>false</use-strict-min>
+                        <flush-strategy>FailingConnectionOnly</flush-strategy>
+                    </pool>
+                    <security>
+                        <user-name>@db.username@</user-name>
+                        <password>@db.password@</password>
+                    </security>
+                    <validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
+                        <validate-on-match>true</validate-on-match>
+                        <background-validation>false</background-validation>
+                        <use-fast-fail>false</use-fast-fail>
+                    </validation>
+                    <timeout>
+                        <idle-timeout-minutes>5</idle-timeout-minutes>
+                        <xa-resource-timeout>0</xa-resource-timeout>
+                    </timeout>
+                    <statement>
+                        <track-statements>false</track-statements>
+                    </statement>
+                </datasource>
                 <drivers>
                     <driver name="MySQL" module="com.mysql" />
                 </drivers>
             </datasources>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"
-            					runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}" auto-deploy-zipped="false"/>
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" auto-deploy-zipped="false"
+                                runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:ee:4.0">
+        <subsystem xmlns="urn:jboss:domain:distributable-ejb:1.0" default-bean-management="default">
+            <infinispan-bean-management name="default" max-active-beans="10000" cache-container="ejb" cache="passivation"/>
+            <local-client-mappings-registry/>
+            <infinispan-timer-management name="persistent" cache-container="ejb" cache="persistent" max-active-timers="10000"/>
+            <infinispan-timer-management name="transient" cache-container="ejb" cache="transient" max-active-timers="10000"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:distributable-web:4.0" default-session-management="default" default-single-sign-on-management="default">
+            <infinispan-session-management name="default" cache-container="web" granularity="SESSION">
+                <local-affinity/>
+            </infinispan-session-management>
+            <infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
+            <local-routing/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:6.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
-                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default"/>
                 </context-services>
                 <managed-thread-factories>
                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
                 </managed-thread-factories>
                 <managed-executor-services>
-                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="5000"/>
                 </managed-executor-services>
                 <managed-scheduled-executor-services>
-                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/lams-ds" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
-        <subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+        <subsystem xmlns="urn:jboss:domain:ejb3:10.0">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <simple-cache name="simple"/>
+                <distributable-cache name="distributable"/>
+            </caches>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
+            </timer-service>
+            <remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
+                <channel-creation-options>
+                    <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
+                </channel-creation-options>
+            </remote>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="60" unit="seconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <application-security-domains>
+                <application-security-domain name="other" security-domain="ApplicationDomain"/>
+            </application-security-domains>
+            <default-missing-method-permissions-deny-access value="true"/>
+            <statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
+            <log-system-exceptions value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:elytron:18.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
             <providers>
                 <aggregate-providers name="combined-providers">
                     <providers name="elytron"/>
@@ -413,6 +365,13 @@
                     <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
                     <realm name="local" role-mapper="super-user-mapper"/>
                 </security-domain>
+                <security-domain name="lams" cache-type="default">
+                    <authentication>
+                        <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
+                            <module-option name="dsJndiName" value="java:jboss/datasources/lams-ds"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
             </security-domains>
             <security-realms>
                 <identity-realm name="local" identity="$local"/>
@@ -447,12 +406,19 @@
                     <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
                 </permission-set>
                 <permission-set name="default-permissions">
-                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
                     <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
                     <permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
+                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
                 </permission-set>
             </permission-sets>
             <http>
+<!--                <http-authentication-factory name="application-http-authentication" security-domain="ApplicationDomain" http-server-mechanism-factory="global">-->
+<!--                    <mechanism-configuration>-->
+<!--                        <mechanism mechanism-name="BASIC">-->
+<!--                            <mechanism-realm realm-name="ApplicationRealm"/>-->
+<!--                        </mechanism>-->
+<!--                    </mechanism-configuration>-->
+<!--                </http-authentication-factory>-->
                 <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
                     <mechanism-configuration>
                         <mechanism mechanism-name="DIGEST">
@@ -482,6 +448,7 @@
                 <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
                     <properties>
                         <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                        <property name="wildfly.sasl.local-user.challenge-path" value="${jboss.server.temp.dir}/auth"/>
                     </properties>
                 </configurable-sasl-server-factory>
                 <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
@@ -491,43 +458,79 @@
                 </mechanism-provider-filtering-sasl-server-factory>
                 <provider-sasl-server-factory name="global"/>
             </sasl>
+            <tls>
+                <key-stores>
+                    <key-store name="applicationKS">
+                        <credential-reference clear-text="password"/>
+                        <implementation type="JKS"/>
+                        <file path="application.keystore" relative-to="jboss.server.config.dir"/>
+                    </key-store>
+                </key-stores>
+                <key-managers>
+                    <key-manager name="applicationKM" key-store="applicationKS" generate-self-signed-certificate-host="localhost">
+                        <credential-reference clear-text="password"/>
+                    </key-manager>
+                </key-managers>
+                <server-ssl-contexts>
+                    <server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
+                </server-ssl-contexts>
+            </tls>
+            <policy name="jacc">
+                <jacc-policy/>
+            </policy>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:7.0">
-            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
-                <local-cache name="default">
-                    <transaction mode="BATCH"/>
+        <subsystem xmlns="urn:wildfly:elytron-oidc-client:2.0"/>
+        <subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
+        <subsystem xmlns="urn:jboss:domain:infinispan:14.0">
+            <cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
+                <local-cache name="entity">
+                    <heap-memory size="10000"/>
+                    <expiration max-idle="100000"/>
                 </local-cache>
+                <local-cache name="local-query">
+                    <heap-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps">
+                    <expiration interval="0"/>
+                </local-cache>
+                <local-cache name="pending-puts">
+                    <expiration max-idle="60000"/>
+                </local-cache>
             </cache-container>
-            <cache-container name="web" default-cache="lams" module="org.wildfly.clustering.web.infinispan">
+            <cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM" aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
                 <local-cache name="passivation">
+                    <expiration interval="0"/>
+                    <file-store passivation="true"/>
+                </local-cache>
+                <local-cache name="persistent">
                     <locking isolation="REPEATABLE_READ"/>
                     <transaction mode="BATCH"/>
-                    <file-store passivation="true" purge="false"/>
+                    <expiration interval="0"/>
+                    <file-store preload="true"/>
                 </local-cache>
-  				<!-- 
-                The default cache below has been added for LAMS.
-                	 In vanilla WildFly "passivation" cache above is used for storing web sessions,
-                	 which allows sessions to be kept between server restarts -->
-                <local-cache name="lams" >
-                	<binary-memory />
-                	<locking isolation="NONE" />
-                    <transaction mode="NONE"/>
-                </local-cache> 
+                <local-cache name="transient">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <expiration interval="0"/>
+                    <file-store passivation="true" purge="true"/>
+                </local-cache>
             </cache-container>
-            <cache-container name="hibernate" default-cache="entity" module="org.infinispan.hibernate-cache" statistics-enabled="true">
-            	<local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+            <cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation">
+                    <expiration interval="0"/>
+                    <file-store passivation="true"/>
                 </local-cache>
+                <local-cache name="sso">
+                    <expiration interval="0"/>
+                </local-cache>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
             <worker name="default"/>
-            <buffer-pool name="default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:5.0">
+        <subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:6.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -553,102 +556,68 @@
             <remoting-connector/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+            <jpa default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
-        <subsystem xmlns="urn:jboss:domain:mail:3.0">
+        <subsystem xmlns="urn:jboss:domain:mail:4.0">
             <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>
             </mail-session>
         </subsystem>
-        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0" security-enabled="false"/>
-        <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:1.0"/>
+        <subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
+        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
+        <subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:4.0">
-            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:6.0">
+            <endpoint worker="default"/>
+            <http-connector name="http-remoting-connector" connector-ref="default" sasl-authentication-factory="application-sasl-authentication"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:5.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:7.1"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:security:2.0">
-            <security-domains>
-                <security-domain name="other" cache-type="default">
-                    <authentication>
-                        <login-module code="Remoting" flag="optional">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                        <login-module code="RealmDirect" flag="required">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                    </authentication>
-                </security-domain>
-                <security-domain name="jboss-web-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-                <security-domain name="jaspitest" cache-type="default">
-                    <authentication-jaspi>
-                        <login-module-stack name="dummy">
-                            <login-module code="Dummy" flag="optional"/>
-                        </login-module-stack>
-                        <auth-module code="Dummy"/>
-                    </authentication-jaspi>
-                </security-domain>
-                <security-domain name="lams" cache-type="default">
-                    <authentication>
-                        <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
-                            <module-option name="dsJndiName" value="java:jboss/datasources/lams-ds"/>
-                        </login-module>
-                    </authentication>
-                </security-domain>
-            </security-domains>
-        </subsystem>
         <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
             <deployment-permissions>
                 <maximum-set>
                     <permission class="java.security.AllPermission"/>
                 </maximum-set>
             </deployment-permissions>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
+        <subsystem xmlns="urn:jboss:domain:transactions:6.0">
             <core-environment node-identifier="${jboss.tx.node.id:1}">
                 <process-id>
                     <uuid/>
                 </process-id>
             </core-environment>
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
             <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:undertow:7.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other">
+        <subsystem xmlns="urn:jboss:domain:undertow:14.0" default-virtual-host="default-host" default-servlet-container="default" default-server="default-server" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}" default-security-domain="other">
+            <byte-buffer-pool name="default"/>
             <buffer-cache name="default"/>
             <server name="default-server">
-                <http-listener name="default" socket-binding="http" enable-http2="true" max-post-size="209715200" />
+                <http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
+                <https-listener name="https" socket-binding="https" ssl-context="applicationSSC" enable-http2="true"/>
                 <host name="default-host" alias="localhost">
                     <location name="/" handler="welcome-content"/>
-                 	<access-log pattern="combined" />
-                 	<http-invoker security-realm="ApplicationRealm"/>
-                    <!-- Enable if running https see (LDEV-3888)
-                    	<filter-ref name="hsts"/>
-                    -->
+                    <http-invoker http-authentication-factory="application-http-authentication"/>
                 </host>
             </server>
- 			<servlet-container name="default" default-encoding="UTF-8" disable-caching-for-secured-pages="false">
-                <jsp-config x-powered-by="false" development="true" trim-spaces="true"/>
+            <servlet-container name="default">
+                <jsp-config/>
                 <websockets/>
             </servlet-container>
             <handlers>
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
-            <filters>
-                <response-header name="hsts" header-name="Strict-Transport-Security" header-value="max-age=3600"/>
-            </filters>
+            <application-security-domains>
+                <application-security-domain name="other" security-domain="ApplicationDomain"/>
+            </application-security-domains>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
+        <subsystem xmlns="urn:jboss:domain:webservices:2.0" statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
             <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
             <endpoint-config name="Standard-Endpoint-Config"/>
             <endpoint-config name="Recording-Endpoint-Config">
@@ -658,7 +627,7 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:5.0"/>
     </profile>
     <interfaces>
         <interface name="management">
@@ -669,15 +638,15 @@
         </interface>
     </interfaces>
     <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
-        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
         <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
         <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
-            <remote-destination host="localhost" port="25"/>
+            <remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file