Index: lams_build/conf/domain.xml
===================================================================
diff -u -r88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb -r6986a20e217fd94d310d64a92f582a09b2ccc406
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 6986a20e217fd94d310d64a92f582a09b2ccc406)
@@ -1,6 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
-<domain xmlns="urn:jboss:domain:4.2">
+<domain xmlns="urn:jboss:domain:8.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
@@ -27,14 +27,20 @@
         <extension module="org.wildfly.extension.batch.jberet"/>
         <extension module="org.wildfly.extension.bean-validation"/>
         <extension module="org.wildfly.extension.clustering.singleton"/>
+        <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.io"/>
         <extension module="org.wildfly.extension.messaging-activemq"/>
+        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
+        <extension module="org.wildfly.iiop-openjdk"/>
     </extensions>
     <system-properties>
-        <!-- IPv4 is not required, but setting this helps avoid unintended use of IPv6 -->
         <property name="java.net.preferIPv4Stack" value="true"/>
     </system-properties>
     <management>
@@ -50,7 +56,7 @@
     </management>
     <profiles>
         <profile name="ha">
-            <subsystem xmlns="urn:jboss:domain:logging:3.0">
+            <subsystem xmlns="urn:jboss:domain:logging:6.0">
                 <use-deployment-logging-config value="false"/>
             	<add-logging-api-dependencies value="true" />
 
@@ -207,7 +213,7 @@
                     </handlers>
                 </root-logger>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0">
+            <subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
                 <default-job-repository name="in-memory"/>
                 <default-thread-pool name="batch"/>
                 <job-repository name="in-memory">
@@ -219,65 +225,67 @@
                 </thread-pool>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
+            <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:datasources:5.0">
                 <datasources>
-                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="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="useLegacyDatetimeCode">false</connection-property>
-				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
-				    
-				    <!-- Properties below are used only for embedded MySQL server -->
-				    <connection-property name="server.basedir">@db.location@</connection-property>
-				    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-				    <connection-property name="server.initialize-user">false</connection-property>
-				    <connection-property name="server.thread_stack">128K</connection-property>
-				    <connection-property name="server.table_cache">4</connection-property>
-				    <connection-property name="server.read_buffer_size">256K</connection-property>
-				    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-				    <connection-property name="server.max_allowed_packet">1M</connection-property>
-				    <connection-property name="server.key_buffer">16K</connection-property>
-				    <connection-property name="server.sort_buffer_size">64K</connection-property>
-				    <connection-property name="server.net_buffer_length">2K</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>
+					<datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="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="useLegacyDatetimeCode">false</connection-property>
+					    <connection-property name="serverTimezone">@db.timezone@</connection-property>
+					    
+					    <!-- Properties below are used only for embedded MySQL server -->
+					    <connection-property name="server.basedir">@db.location@</connection-property>
+					    <connection-property name="createDatabaseIfNotExist">false</connection-property>
+					    <connection-property name="server.initialize-user">false</connection-property>
+					    <connection-property name="server.thread_stack">128K</connection-property>
+					    <connection-property name="server.table_cache">4</connection-property>
+					    <connection-property name="server.read_buffer_size">256K</connection-property>
+					    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
+					    <connection-property name="server.max_allowed_packet">1M</connection-property>
+					    <connection-property name="server.key_buffer">16K</connection-property>
+					    <connection-property name="server.sort_buffer_size">64K</connection-property>
+					    <connection-property name="server.net_buffer_length">2K</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:discovery:1.0"/>
             <subsystem xmlns="urn:jboss:domain:ee:4.0">
                 <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
                 <concurrent>
@@ -294,24 +302,21 @@
                         <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-services>
                 </concurrent>
-                <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/lams-ds" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" 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/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"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
+            <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
                 <session-bean>
                     <stateless>
                         <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
                     </stateless>
                     <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
                     <singleton default-access-timeout="5000"/>
                 </session-bean>
-                <mdb>
-                    <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
-                    <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
-                </mdb>
                 <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"/>
+                        <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                     </bean-instance-pools>
                 </pools>
                 <caches>
@@ -327,7 +332,12 @@
                         <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
                     </data-stores>
                 </timer-service>
-                <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
+                <remote connector-ref="http-remoting-connector" thread-pool-name="default">
+                    <channel-creation-options>
+                        <option name="READ_TIMEOUT" value="${prop.remoting-connector.read.timeout:20}" type="xnio"/>
+                        <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
+                    </channel-creation-options>
+                </remote>
                 <thread-pools>
                     <thread-pool name="default">
                         <max-threads count="10"/>
@@ -338,69 +348,128 @@
                 <default-missing-method-permissions-deny-access value="true"/>
                 <log-system-exceptions value="true"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:io:1.1">
-                <worker name="default"/>
-                <buffer-pool name="default"/>
+            <subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+                <providers>
+                    <aggregate-providers name="combined-providers">
+                        <providers name="elytron"/>
+                        <providers name="openssl"/>
+                    </aggregate-providers>
+                    <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+                    <provider-loader name="openssl" module="org.wildfly.openssl"/>
+                </providers>
+                <audit-logging>
+                    <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
+                </audit-logging>
+                <security-domains>
+                    <security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
+                        <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
+                    </security-domain>
+                </security-domains>
+                <security-realms>
+                    <identity-realm name="local" identity="$local"/>
+                    <properties-realm name="ApplicationRealm">
+                        <users-properties path="application-users.properties" relative-to="jboss.domain.config.dir" digest-realm-name="ApplicationRealm"/>
+                        <groups-properties path="application-roles.properties" relative-to="jboss.domain.config.dir"/>
+                    </properties-realm>
+                </security-realms>
+                <mappers>
+                    <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
+                        <permission-mapping>
+                            <principal name="anonymous"/>
+                            <permission-set name="default-permissions"/>
+                        </permission-mapping>
+                        <permission-mapping match-all="true">
+                            <permission-set name="login-permission"/>
+                            <permission-set name="default-permissions"/>
+                        </permission-mapping>
+                    </simple-permission-mapper>
+                    <constant-realm-mapper name="local" realm-name="local"/>
+                    <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+                    <constant-role-mapper name="super-user-mapper">
+                        <role name="SuperUser"/>
+                    </constant-role-mapper>
+                </mappers>
+                <permission-sets>
+                    <permission-set name="login-permission">
+                        <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-set>
+                </permission-sets>
+                <http>
+                    <provider-http-server-mechanism-factory name="global"/>
+                </http>
+                <sasl>
+                    <sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
+                        <mechanism-configuration>
+                            <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                            <mechanism mechanism-name="DIGEST-MD5">
+                                <mechanism-realm realm-name="ApplicationRealm"/>
+                            </mechanism>
+                        </mechanism-configuration>
+                    </sasl-authentication-factory>
+                    <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
+                        <properties>
+                            <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                        </properties>
+                    </configurable-sasl-server-factory>
+                    <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
+                        <filters>
+                            <filter provider-name="WildFlyElytron"/>
+                        </filters>
+                    </mechanism-provider-filtering-sasl-server-factory>
+                    <provider-sasl-server-factory name="global"/>
+                </sasl>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
+            <subsystem xmlns="urn:jboss:domain:infinispan:7.0">
                 <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
                     <transport lock-timeout="60000"/>
-                    <replicated-cache name="default" mode="SYNC">
+                    <replicated-cache name="default">
                         <transaction mode="BATCH"/>
                     </replicated-cache>
                 </cache-container>
                 <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
                     <transport lock-timeout="60000"/>
-                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist">
                         <locking isolation="REPEATABLE_READ"/>
-                        <transaction mode="BATCH" locking="OPTIMISTIC" />
+                        <transaction mode="BATCH"/>
                         <file-store/>
                     </distributed-cache>
-                    <distributed-cache name="concurrent" mode="SYNC" l1-lifespan="0" owners="2">
-                        <file-store/>
-                    </distributed-cache>
                 </cache-container>
                 <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
                     <transport lock-timeout="60000"/>
-                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist">
                         <locking isolation="REPEATABLE_READ"/>
                         <transaction mode="BATCH"/>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
-	                <local-cache name="entity" statistics-enabled="true">
-	                   <!-- 
-	                   	<transaction mode="NON_XA"/>
-	                    <eviction strategy="LRU" max-entries="50000"/>
-	                    <expiration max-idle="100000" lifespan="1000000"/>
-	                   -->
-	                </local-cache>
-	                <local-cache name="local-query" statistics-enabled="true">
-	                   <!--
-	                    <transaction mode="NONE"/>
-	                    <eviction strategy="LRU" max-entries="10000"/>
-	                    <expiration max-idle="100000"/>
-	                   -->
-	                </local-cache>
-	             <!-- 
-	                <local-cache name="timestamps" statistics-enabled="true">
-	                    <transaction mode="NONE"/>
-	                    <eviction strategy="NONE"/>
-	                </local-cache>
-	                <local-cache name="contentrepository-entity" statistics-enabled="true">
-	                    <transaction mode="NON_XA"/>
-	                    <eviction strategy="LRU" max-entries="200"/>
-	                    <expiration max-idle="100000" lifespan="900000"/>
-	                </local-cache>
-	             -->
+                <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                    <transport lock-timeout="60000"/>
+                    <local-cache name="local-query">
+                        <object-memory size="10000"/>
+                        <expiration max-idle="100000"/>
+                    </local-cache>
+                    <invalidation-cache name="entity">
+                        <transaction mode="NON_XA"/>
+                        <object-memory size="10000"/>
+                        <expiration max-idle="100000"/>
+                    </invalidation-cache>
+                    <replicated-cache name="timestamps"/>
                 </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:4.0">
+            <subsystem xmlns="urn:jboss:domain:jca:5.0">
                 <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
                 <bean-validation enabled="true"/>
- 				<default-workmanager>
+                <default-workmanager>
                     <short-running-threads>
                         <core-threads count="50"/>
                         <queue-length count="50"/>
@@ -417,104 +486,75 @@
                 <cached-connection-manager/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jgroups:4.0">
+            <subsystem xmlns="urn:jboss:domain:jgroups:6.0">
                 <channels default="ee">
-                    <channel name="ee" stack="udp"/>
+                    <channel name="ee" stack="udp" cluster="ejb"/>
                 </channels>
                 <stacks>
-            		<stack name="udp">
-                    <transport type="UDP" socket-binding="jgroups-udp"/>
-                    <protocol type="PING"/>
-                    <protocol type="MERGE3"/>
-                    <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                    <protocol type="FD_ALL"/>
-                    <protocol type="VERIFY_SUSPECT"/>
-                    <protocol type="pbcast.NAKACK2"/>
-                    <protocol type="UNICAST3"/>
-                    <protocol type="pbcast.STABLE"/>
-                    <protocol type="pbcast.GMS"/>
-                    <protocol type="UFC"/>
-                    <protocol type="MFC"/>
-                    <protocol type="FRAG2"/>
-                </stack>
-                <stack name="tcp">
-                    <transport type="TCP" socket-binding="jgroups-tcp"/>
-                    <protocol type="MPING" socket-binding="jgroups-mping"/>
-                    <protocol type="MERGE3"/>
-                    <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
-                    <protocol type="FD"/>
-                    <protocol type="VERIFY_SUSPECT"/>
-                    <protocol type="pbcast.NAKACK2"/>
-                    <protocol type="UNICAST3"/>
-                    <protocol type="pbcast.STABLE"/>
-                    <protocol type="pbcast.GMS"/>
-                    <protocol type="MFC"/>
-                    <protocol type="FRAG2"/>
+                    <stack name="udp">
+                        <transport type="UDP" socket-binding="jgroups-udp"/>
+                        <protocol type="PING"/>
+                        <protocol type="MERGE3"/>
+                        <protocol type="FD_SOCK"/>
+                        <protocol type="FD_ALL"/>
+                        <protocol type="VERIFY_SUSPECT"/>
+                        <protocol type="pbcast.NAKACK2"/>
+                        <protocol type="UNICAST3"/>
+                        <protocol type="pbcast.STABLE"/>
+                        <protocol type="pbcast.GMS"/>
+                        <protocol type="UFC"/>
+                        <protocol type="MFC"/>
+                        <protocol type="FRAG3"/>
                     </stack>
+                    <stack name="tcp">
+                        <transport type="TCP" socket-binding="jgroups-tcp"/>
+                        <socket-protocol type="MPING" socket-binding="jgroups-mping"/>
+                        <protocol type="MERGE3"/>
+                        <protocol type="FD_SOCK"/>
+                        <protocol type="FD_ALL"/>
+                        <protocol type="VERIFY_SUSPECT"/>
+                        <protocol type="pbcast.NAKACK2"/>
+                        <protocol type="UNICAST3"/>
+                        <protocol type="pbcast.STABLE"/>
+                        <protocol type="pbcast.GMS"/>
+                        <protocol type="MFC"/>
+                        <protocol type="FRAG3"/>
+                    </stack>
                 </stacks>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jmx:1.3">
                 <expose-resolved-model/>
                 <expose-expression-model/>
-                <!--<remoting-connector use-management-endpoint="false"/>-->
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jpa:1.1">
                 <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
+            <subsystem xmlns="urn:jboss:domain:mail:3.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:jboss:domain:messaging-activemq:1.0">
-                <server name="default">
-                    <cluster password="${jboss.messaging.cluster.password:mypass}"/>
-                    <security-setting name="#">
-                        <role name="guest" send="true" consume="true" create-non-durable-queue="true" delete-non-durable-queue="true"/>
-                    </security-setting>
-                    <address-setting name="#" dead-letter-address="jms.queue.DLQ" expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760" page-size-bytes="2097152" message-counter-history-day-limit="10" redistribution-delay="1000"/>
-                    <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
-                    <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
-                        <param name="batch-delay" value="50"/>
-                    </http-connector>
-                    <in-vm-connector name="in-vm" server-id="0"/>
-                    <http-acceptor name="http-acceptor" http-listener="default"/>
-                    <http-acceptor name="http-acceptor-throughput" http-listener="default">
-                        <param name="batch-delay" value="50"/>
-                        <param name="direct-deliver" value="false"/>
-                    </http-acceptor>
-                    <in-vm-acceptor name="in-vm" server-id="0"/>
-                    <broadcast-group name="bg-group1" jgroups-channel="activemq-cluster" connectors="http-connector"/>
-                    <discovery-group name="dg-group1" jgroups-channel="activemq-cluster"/>
-                    <cluster-connection name="my-cluster" address="jms" connector-name="http-connector" discovery-group="dg-group1"/>
-                    <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/>
-                    <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/>
-                    <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory" connectors="in-vm"/>
-                    <connection-factory name="RemoteConnectionFactory" entries="java:jboss/exported/jms/RemoteConnectionFactory" connectors="http-connector" ha="true" block-on-acknowledge="true" reconnect-attempts="-1"/>
-                    <pooled-connection-factory name="activemq-ra" entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory" connectors="in-vm" transaction="xa"/>
-                </server>
-            </subsystem>
-            <subsystem xmlns="urn:jboss:domain:modcluster:2.0">
-                <mod-cluster-config advertise-socket="modcluster" connector="ajp">
+            <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
+            <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:modcluster:4.0">
+                <proxy name="default" advertise-socket="modcluster" listener="ajp">
                     <dynamic-load-provider>
                         <load-metric type="cpu"/>
                     </dynamic-load-provider>
-                </mod-cluster-config>
+                </proxy>
             </subsystem>
             <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:3.0">
-                <endpoint/>
+            <subsystem xmlns="urn:jboss:domain:remoting:4.0">
                 <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
             <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:resource-adapters:5.0"/>
             <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:security:1.2">
+            <subsystem xmlns="urn:jboss:domain:security:2.0">
                 <security-domains>
                     <security-domain name="other" cache-type="default">
                         <authentication>
@@ -531,11 +571,6 @@
                             <policy-module code="Delegating" flag="required"/>
                         </authorization>
                     </security-domain>
-                    <security-domain name="jboss-ejb-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">
@@ -544,6 +579,11 @@
                             <auth-module code="Dummy"/>
                         </authentication-jaspi>
                     </security-domain>
+                    <security-domain name="jboss-ejb-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
                     <security-domain name="lams" cache-type="default">
                         <authentication>
                             <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
@@ -567,44 +607,35 @@
                     </singleton-policy>
                 </singleton-policies>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:transactions:3.0">
-                <core-environment>
+            <subsystem xmlns="urn:jboss:domain:transactions:5.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"/>
+                <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:undertow:3.1">
+            <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">
                 <buffer-cache name="default"/>
                 <server name="default-server">
                     <ajp-listener name="ajp" socket-binding="ajp"/>
                     <http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
                     <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
                     <host name="default-host" alias="localhost">
                         <location name="/" handler="welcome-content"/>
-	                	 <!-- Removing server headers
-		                    <filter-ref name="server-header"/>
-		                    <filter-ref name="x-powered-by-header"/>
-	                 	-->
-                         <!-- Enable if running https see (LDEV-3888)
-                            <filter-ref name="hsts"/>
-                         -->
+                        <http-invoker security-realm="ApplicationRealm"/>
                     </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="server-header" header-name="Server" header-value="WildFly/10"/>
-                    <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
-                </filters>
             </subsystem>
-        	<subsystem xmlns="urn:jboss:domain:webservices:2.0">
+            <subsystem xmlns="urn:jboss:domain:webservices:2.0">
                 <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
                 <endpoint-config name="Standard-Endpoint-Config"/>
                 <endpoint-config name="Recording-Endpoint-Config">
@@ -614,40 +645,28 @@
                 </endpoint-config>
                 <client-config name="Standard-Client-Config"/>
             </subsystem>
-        	<subsystem xmlns="urn:jboss:domain:weld:3.0"/>
+            <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
         </profile>
     </profiles>
-    <!--
-      ~ 
-      ~          Named interfaces that can be referenced elsewhere in the configuration. The configuration
-      ~          for how to associate these logical names with an actual network interface can either
-      ~          be specified here or can be declared on a per-host basis in the equivalent element in host.xml.
-      ~ 
-      ~          These default configurations require the binding specification to be done in host.xml.
-      ~     
-      -->
     <interfaces>
         <interface name="management"/>
         <interface name="public"/>
-        <interface name="private">
-            <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
-        </interface>
         <interface name="unsecure">
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>
+        <interface name="private">
+            <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
+        </interface>
     </interfaces>
     <socket-binding-groups>
         <socket-binding-group name="ha-sockets" default-interface="public">
-            <!-- Needed for server groups using the 'ha' profile  -->
             <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="jgroups-mping" interface="private" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+            <socket-binding name="modcluster" multicast-address="${jboss.modcluster.multicast.address:224.0.1.105}" multicast-port="23364"/>
+            <socket-binding name="jgroups-mping" interface="private" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
-            <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
             <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-            <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
-            <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
             <socket-binding name="txn-status-manager" port="4713"/>
             <outbound-socket-binding name="mail-smtp">
@@ -663,4 +682,61 @@
             <socket-binding-group ref="ha-sockets"/>
         </server-group>
     </server-groups>
+    <host-excludes>
+        <host-exclude name="WildFly10.0">
+            <host-release id="WildFly10.0"/>
+            <excluded-extensions>
+                <extension module="org.wildfly.extension.core-management"/>
+                <extension module="org.wildfly.extension.datasources-agroal"/>
+                <extension module="org.wildfly.extension.discovery"/>
+                <extension module="org.wildfly.extension.ee-security"/>
+                <extension module="org.wildfly.extension.elytron"/>
+                <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+            </excluded-extensions>
+        </host-exclude>
+        <host-exclude name="WildFly10.1">
+            <host-release id="WildFly10.1"/>
+            <excluded-extensions>
+                <extension module="org.wildfly.extension.core-management"/>
+                <extension module="org.wildfly.extension.datasources-agroal"/>
+                <extension module="org.wildfly.extension.discovery"/>
+                <extension module="org.wildfly.extension.ee-security"/>
+                <extension module="org.wildfly.extension.elytron"/>
+                <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+            </excluded-extensions>
+        </host-exclude>
+        <host-exclude name="WildFly11.0">
+            <host-release id="WildFly11.0"/>
+            <excluded-extensions>
+                <extension module="org.wildfly.extension.datasources-agroal"/>
+                <extension module="org.wildfly.extension.ee-security"/>
+                <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+            </excluded-extensions>
+        </host-exclude>
+        <host-exclude name="WildFly12.0">
+            <host-release id="WildFly12.0"/>
+            <excluded-extensions>
+                <extension module="org.wildfly.extension.datasources-agroal"/>
+                <extension module="org.wildfly.extension.ee-security"/>
+                <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+            </excluded-extensions>
+        </host-exclude>
+        <host-exclude name="WildFly13.0">
+            <host-release id="WildFly13.0"/>
+            <excluded-extensions>
+                <extension module="org.wildfly.extension.datasources-agroal"/>
+                <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+                <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+            </excluded-extensions>
+        </host-exclude>
+    </host-excludes>
 </domain>
\ No newline at end of file
Index: lams_build/conf/host.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6986a20e217fd94d310d64a92f582a09b2ccc406
--- lams_build/conf/host.xml	(.../host.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/conf/host.xml	(.../host.xml)	(revision 6986a20e217fd94d310d64a92f582a09b2ccc406)
@@ -1,19 +1,21 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
-<host xmlns="urn:jboss:domain:4.2" name="master">
+<host xmlns="urn:jboss:domain:8.0" name="master">
     <extensions>
         <extension module="org.jboss.as.jmx"/>
+        <extension module="org.wildfly.extension.core-management"/>
+        <extension module="org.wildfly.extension.elytron"/>
     </extensions>
     <management>
         <security-realms>
             <security-realm name="ManagementRealm">
                 <authentication>
-                    <local default-user="$local" skip-group-loading="true" />
+                    <local default-user="$local" skip-group-loading="true"/>
                     <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
                 </authentication>
                 <authorization map-groups-to-roles="false">
                     <properties path="mgmt-groups.properties" relative-to="jboss.domain.config.dir"/>
-                </authorization>                
+                </authorization>
             </security-realm>
             <security-realm name="ApplicationRealm">
                 <server-identities>
@@ -22,8 +24,8 @@
                     </ssl>
                 </server-identities>
                 <authentication>
-                    <local default-user="$local" allowed-users="*" skip-group-loading="true" />
-                    <properties path="application-users.properties" relative-to="jboss.domain.config.dir" />
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.domain.config.dir"/>
                 </authentication>
                 <authorization>
                     <properties path="application-roles.properties" relative-to="jboss.domain.config.dir"/>
@@ -32,16 +34,16 @@
         </security-realms>
         <audit-log>
             <formatters>
-               <json-formatter name="json-formatter"/>
+                <json-formatter name="json-formatter"/>
             </formatters>
             <handlers>
                 <file-handler name="host-file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.domain.data.dir"/>
                 <file-handler name="server-file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
             </handlers>
             <logger log-boot="true" log-read-only="false" enabled="false">
-               <handlers>
-                  <handler name="host-file"/>
-               </handlers>
+                <handlers>
+                    <handler name="host-file"/>
+                </handlers>
             </logger>
             <server-logger log-boot="true" log-read-only="false" enabled="false">
                 <handlers>
@@ -50,43 +52,36 @@
             </server-logger>
         </audit-log>
         <management-interfaces>
-            <native-interface security-realm="ManagementRealm">
-                <socket interface="management" port="${jboss.management.native.port:9999}"/>
-            </native-interface>
-            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
+            <http-interface security-realm="ManagementRealm">
+                <http-upgrade enabled="true"/>
                 <socket interface="management" port="${jboss.management.http.port:9990}"/>
             </http-interface>
         </management-interfaces>
     </management>
-
     <domain-controller>
-       <local/>
-       <!-- Alternative remote domain controller configuration with a host and port -->
-        <!-- <remote protocol="remote" host="${jboss.domain.master.address}" port="${jboss.domain.master.port:9999}" security-realm="ManagementRealm"/> -->
+        <local/>
     </domain-controller>
-
     <interfaces>
         <interface name="management">
             <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
         </interface>
         <interface name="public">
-           <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
     </interfaces>
-
- 	<jvms>
- 	   <jvm name="default">
-          <heap size="64m" max-size="256m"/>
+    <jvms>
+        <jvm name="default">
+            <heap size="64m" max-size="256m"/>
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
                 <option value="-XX:MaxMetaspaceSize=256m"/>
+                <option value="--add-exports=java.base/sun.nio.ch=ALL-UNNAMED"/>
             </jvm-options>
-       </jvm>
- 	</jvms>
-
+        </jvm>
+    </jvms>
     <servers>
-        <server name="server-one" group="lams-server-group" auto-start="true">
+		<server name="server-one" group="lams-server-group" auto-start="true">
              <!--
               ~ 
               ~             <jvm name="default">
@@ -122,10 +117,91 @@
         </server>
     </servers>
     <profile>
+        <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+        <subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+            <providers>
+                <aggregate-providers name="combined-providers">
+                    <providers name="elytron"/>
+                    <providers name="openssl"/>
+                </aggregate-providers>
+                <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+                <provider-loader name="openssl" module="org.wildfly.openssl"/>
+            </providers>
+            <audit-logging>
+                <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.domain.log.dir" format="JSON"/>
+            </audit-logging>
+            <security-domains>
+                <security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local" role-mapper="super-user-mapper"/>
+                </security-domain>
+            </security-domains>
+            <security-realms>
+                <identity-realm name="local" identity="$local"/>
+                <properties-realm name="ManagementRealm">
+                    <users-properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir" digest-realm-name="ManagementRealm"/>
+                    <groups-properties path="mgmt-groups.properties" relative-to="jboss.domain.config.dir"/>
+                </properties-realm>
+            </security-realms>
+            <mappers>
+                <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
+                    <permission-mapping>
+                        <principal name="anonymous"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                    <permission-mapping match-all="true">
+                        <permission-set name="login-permission"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                </simple-permission-mapper>
+                <constant-realm-mapper name="local" realm-name="local"/>
+                <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+                <constant-role-mapper name="super-user-mapper">
+                    <role name="SuperUser"/>
+                </constant-role-mapper>
+            </mappers>
+            <permission-sets>
+                <permission-set name="login-permission">
+                    <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
+                </permission-set>
+                <permission-set name="default-permissions"/>
+            </permission-sets>
+            <http>
+                <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="BASIC">
+                            <mechanism-realm realm-name="Management Realm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </http-authentication-factory>
+                <provider-http-server-mechanism-factory name="global"/>
+            </http>
+            <sasl>
+                <sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
+                    <properties>
+                        <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                    </properties>
+                </configurable-sasl-server-factory>
+                <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
+                    <filters>
+                        <filter provider-name="WildFlyElytron"/>
+                    </filters>
+                </mechanism-provider-filtering-sasl-server-factory>
+                <provider-sasl-server-factory name="global"/>
+            </sasl>
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
             <remoting-connector/>
         </subsystem>
     </profile>
-</host>
+</host>
\ No newline at end of file