Index: lams_build/conf/domain.xml
===================================================================
diff -u -r713c85b7c18fa089747d0749e09d40bc15b6b422 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -1,13 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" ?>
 
-<domain xmlns="urn:jboss:domain:2.2">
+<domain xmlns="urn:jboss:domain:4.2">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
-        <extension module="org.jboss.as.jacorb"/>
         <extension module="org.jboss.as.jaxrs"/>
         <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
@@ -16,7 +15,6 @@
         <extension module="org.jboss.as.jsr77"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
-        <extension module="org.jboss.as.messaging"/>
         <extension module="org.jboss.as.modcluster"/>
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.pojo"/>
@@ -26,8 +24,13 @@
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
-        <extension module="org.wildfly.extension.batch"/>
+        <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.io"/>
+        <extension module="org.wildfly.extension.messaging-activemq"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
     <system-properties>
@@ -47,60 +50,92 @@
     </management>
     <profiles>
         <profile name="ha">
-            <subsystem xmlns="urn:jboss:domain:logging:2.0">
-               <use-deployment-logging-config value="false"/>
-                <console-handler name="CONSOLE">
-                    <level name="INFO"/>
+            <subsystem xmlns="urn:jboss:domain:logging:3.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="CONSOLEPATTERN"/>
-                    </formatter>
-                    <target name="System.out"/>
-                </console-handler>
-                <console-handler name="LAMSCONSOLE">
-                    <level name="DEBUG"/>
-                    <formatter>
-                        <named-formatter name="LAMSCONSOLEPATTERN"/>
-                    </formatter>
-                    <target name="System.out"/>
-                </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>
-                <periodic-rotating-file-handler name="AUDITFILE" autoflush="true">
+
+	            <console-handler name="CONSOLE">
+	                <target name="System.out" />
+	                <level name="INFO" />
+	                <formatter>
+	                    <named-formatter name="CONSOLEPATTERN" />
+	                </formatter>
+	            </console-handler>
+	
+	            <periodic-rotating-file-handler name="AUDITFILE" autoflush="true">
+	                    <level name="INFO"/>
+	                    <formatter>
+	                        <named-formatter name="AUDITPATTERN"/>
+	                    </formatter>
+	                    <file relative-to="jboss.server.log.dir" path="audit.log"/>
+	                    <suffix value="'.'yyyy-MM-dd"/>
+	                    <append value="true"/>
+	                </periodic-rotating-file-handler>
+	
+	            <size-rotating-file-handler name="LAMSFILE" autoflush="true">
+	                    <level name="DEBUG"/>
+	                    <formatter>
+	                        <named-formatter name="LAMSPATTERN"/>
+	                    </formatter>
+	                    <file relative-to="jboss.server.log.dir" path="lams.log"/>
+	                    <rotate-size value="5m"/>
+	                    <max-backup-index value="20"/>
+	                    <append value="true"/>
+	                </size-rotating-file-handler>
+	
+	            <console-handler name="LAMSCONSOLE">
+	                <target name="System.out" />
+	                <level name="DEBUG" />
+	                <formatter>
+	                    <named-formatter name="LAMSCONSOLEPATTERN" />
+	                </formatter>
+	            </console-handler>
+	
+	            <size-rotating-file-handler name="HIBERNATEFILE" autoflush="true">
                     <level name="INFO"/>
                     <formatter>
-                        <named-formatter name="AUDITPATTERN"/>
-                    </formatter>
-                    <file relative-to="jboss.server.log.dir" path="audit.log"/>
-                    <suffix value="'.'yyyy-MM-dd"/>
-                    <append value="true"/>
-                </periodic-rotating-file-handler>
-                <size-rotating-file-handler name="LAMSFILE" autoflush="true">
-                    <level name="DEBUG"/>
-                    <formatter>
-                        <named-formatter name="LAMSPATTERN"/>
-                    </formatter>
-                    <file relative-to="jboss.server.log.dir" path="lams.log"/>
-                    <rotate-size value="5m"/>
-                    <max-backup-index value="20"/>
-                    <append value="true"/>
-                </size-rotating-file-handler>
-                <size-rotating-file-handler name="HIBERNATEFILE" autoflush="true">
-                    <level name="INFO"/>
-                    <formatter>
                         <named-formatter name="HIBERNATEPATTERN"/>
                     </formatter>
                     <file relative-to="jboss.server.log.dir" path="hibernatelams.log"/>
                     <rotate-size value="5m"/>
                     <max-backup-index value="20"/>
                     <append value="true"/>
                 </size-rotating-file-handler>
-                <logger category="org.lamsfoundation.lams" use-parent-handlers="false">
+	
+	            <!-- 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="AUDITPATTERN">
+	                <pattern-formatter
+	                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %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="org.lamsfoundation.lams" use-parent-handlers="false">
                     <level name="DEBUG"/>
                     <handlers>
                         <handler name="LAMSFILE"/>
@@ -114,31 +149,22 @@
                         <handler name="LAMSCONSOLE"/>
                     </handlers>
                 </logger>
-                <logger category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter" use-parent-handlers="false">
+
+            	<logger category="org.lamsfoundation.lams.util.audit" use-parent-handlers="false">
                     <level name="INFO"/>
                     <handlers>
-                        <handler name="LAMSFILE"/>
-                        <handler name="LAMSCONSOLE"/>
-                    </handlers>
-                </logger>
-                <logger category="org.lamsfoundation.lams.util.audit" use-parent-handlers="false">
-                    <level name="INFO"/>
-                    <handlers>
                         <handler name="AUDITFILE"/>
                     </handlers>
                 </logger>
-                <logger category="org.hibernate" use-parent-handlers="false">
+
+            	<logger category="org.hibernate"
+            		use-parent-handlers="false">
                     <level name="INFO"/>
                     <handlers>
                         <handler name="HIBERNATEFILE"/>
                     </handlers>
                 </logger>
-                <logger category="org.hibernate.engine.StatefulPersistenceContext" use-parent-handlers="false">
-                    <level name="ERROR"/>
-                    <handlers>
-                        <handler name="HIBERNATEFILE"/>
-                    </handlers>
-                </logger>
+
                 <logger category="org.springframework.beans.factory.support.DefaultListableBeanFactory">
                     <level name="INFO"/>
                 </logger>
@@ -178,7 +204,7 @@
                 <logger category="org.springframework.transaction.jta">
                     <level name="INFO"/>
                 </logger>
-                <logger category="org.springframework.orm.hibernate4">
+                <logger category="org.springframework.orm.hibernate5">
                     <level name="INFO"/>
                 </logger>
                 <logger category="org.springframework.beans.factory.annotation">
@@ -187,42 +213,37 @@
                 <logger category="org.apache.struts.tiles">
                     <level name="WARN"/>
                 </logger>
+                <logger category="com.arjuna">
+                    <level name="WARN"/>
+                </logger>
+                <logger category="org.jboss.as.config">
+                    <level name="DEBUG"/>
+                </logger>
+                <logger category="sun.rmi">
+                    <level name="WARN"/>
+                </logger>
+                
                 <root-logger>
                     <level name="DEBUG"/>
                     <handlers>
                         <handler name="CONSOLE"/>
                         <handler name="FILE"/>
                     </handlers>
                 </root-logger>
-                <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="AUDITPATTERN">
-                    <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n"/>
-                </formatter>
-                <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>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:batch:1.0">
-                <job-repository>
+            <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0">
+                <default-job-repository name="in-memory"/>
+                <default-thread-pool name="batch"/>
+                <job-repository name="in-memory">
                     <in-memory/>
                 </job-repository>
-                <thread-pool>
+                <thread-pool name="batch">
                     <max-threads count="10"/>
                     <keepalive-time time="30" unit="seconds"/>
                 </thread-pool>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+            <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:4.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>
@@ -279,39 +300,45 @@
                 </drivers>
             </datasources>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:ee:2.0">
+            <subsystem xmlns="urn:jboss:domain:ee:4.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-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" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                        <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-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" core-threads="2" keepalive-time="3000"/>
+                        <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>
-                    <managed-thread-factories>
-                        <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
-                    </managed-thread-factories>
                 </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"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
+            <subsystem xmlns="urn:jboss:domain:ejb3:4.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>
-                        <!-- A sample strict max pool configuration -->
-                        <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                        <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" 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"/>
+                        <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>
                     <cache name="simple"/>
-                    <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
+                    <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
                 </caches>
                 <passivation-stores>
                     <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
@@ -331,40 +358,71 @@
                 </thread-pools>
                 <default-security-domain value="other"/>
                 <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>
-            <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+            <subsystem xmlns="urn:jboss:domain:infinispan:4.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" batching="true">
-                        <locking isolation="REPEATABLE_READ"/>
+                    <replicated-cache name="default" mode="SYNC">
+                        <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" batching="true" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                        <locking isolation="REPEATABLE_READ"/>
+                        <transaction mode="BATCH" locking="OPTIMISTIC" />
                         <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" batching="true" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                        <locking isolation="REPEATABLE_READ"/>
+                        <transaction mode="BATCH"/>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name="hibernate" start="EAGER" module="org.hibernate">
-                    <local-cache name="entity" statistics-enabled="true"/>
-                    <local-cache name="local-query" statistics-enabled="true"/>
+                <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>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jca:2.0">
+            <subsystem xmlns="urn:jboss:domain:jca:4.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"/>
@@ -381,8 +439,12 @@
                 <cached-connection-manager/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
-                <stack name="udp">
+            <subsystem xmlns="urn:jboss:domain:jgroups:4.0">
+                <channels default="ee">
+                    <channel name="ee" stack="udp"/>
+                </channels>
+                <stacks>
+            		<stack name="udp">
                     <transport type="UDP" socket-binding="jgroups-udp"/>
                     <protocol type="PING"/>
                     <protocol type="MERGE3"/>
@@ -396,12 +458,11 @@
                     <protocol type="UFC"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="RSVP"/>
                 </stack>
                 <stack name="tcp">
                     <transport type="TCP" socket-binding="jgroups-tcp"/>
                     <protocol type="MPING" socket-binding="jgroups-mping"/>
-                    <protocol type="MERGE2"/>
+                    <protocol type="MERGE3"/>
                     <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
                     <protocol type="FD"/>
                     <protocol type="VERIFY_SUSPECT"/>
@@ -411,8 +472,8 @@
                     <protocol type="pbcast.GMS"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="RSVP"/>
-                </stack>
+                    </stack>
+                </stacks>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jmx:1.3">
                 <expose-resolved-model/>
@@ -423,12 +484,41 @@
                 <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">
                 <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:modcluster:1.2">
+            <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">
                     <dynamic-load-provider>
                         <load-metric type="cpu"/>
@@ -439,11 +529,12 @@
                 <remote-naming/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:remoting:2.0">
-                <endpoint worker="default"/>
+            <subsystem xmlns="urn:jboss:domain:remoting:3.0">
+                <endpoint/>
                 <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+            <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
+            <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
             <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
             <subsystem xmlns="urn:jboss:domain:security:1.2">
                 <security-domains>
@@ -467,6 +558,14 @@
                             <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">
@@ -476,19 +575,34 @@
                     </security-domain>
                 </security-domains>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:transactions:2.0">
+            <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:singleton:1.0">
+                <singleton-policies default="default">
+                    <singleton-policy name="default" cache-container="server">
+                        <simple-election-policy/>
+                    </singleton-policy>
+                </singleton-policies>
+            </subsystem>
+            <subsystem xmlns="urn:jboss:domain:transactions:3.0">
                 <core-environment>
                     <process-id>
                         <uuid/>
                     </process-id>
                 </core-environment>
                 <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:undertow:1.2">
+            <subsystem xmlns="urn:jboss:domain:undertow:3.1">
                 <buffer-cache name="default"/>
                 <server name="default-server">
-                    <http-listener name="default" socket-binding="http" max-post-size="104857600"/>
                     <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
@@ -500,20 +614,19 @@
                          -->
                     </host>
                 </server>
-                <servlet-container name="default" disable-caching-for-secured-pages="false">
-                    <jsp-config x-powered-by="false" trim-spaces="true"/>
+           		<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"/>
                     <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"/>
-                    <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
+                    <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:1.2">
+        	<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">
@@ -523,7 +636,7 @@
                 </endpoint-config>
                 <client-config name="Standard-Client-Config"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
+        	<subsystem xmlns="urn:jboss:domain:weld:3.0"/>
         </profile>
     </profiles>
     <!--
@@ -538,19 +651,24 @@
     <interfaces>
         <interface name="management"/>
         <interface name="public"/>
-        <interface name="unsecure"/>
+        <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>
     </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" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
-            <socket-binding name="jgroups-tcp" port="7600"/>
-            <socket-binding name="jgroups-tcp-fd" port="57600"/>
-            <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-            <socket-binding name="jgroups-udp-fd" port="54200"/>
+            <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="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"/>