Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -rd79b69a569a5c0b962129b601afc63f974bafa72 -r5481be6efd2db34ce6a5b5f3c7def47dcc79be91
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision d79b69a569a5c0b962129b601afc63f974bafa72)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 5481be6efd2db34ce6a5b5f3c7def47dcc79be91)
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:2.2">
+<server xmlns="urn:jboss:domain:8.0">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.deployment-scanner"/>
         <extension module="org.jboss.as.ee"/>
-        <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
-        <extension module="org.jboss.as.jsf"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.remoting"/>
@@ -43,7 +41,7 @@
                 <json-formatter name="json-formatter"/>
             </formatters>
             <handlers>
-                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+                <file-handler name="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>
@@ -52,25 +50,17 @@
             </logger>
         </audit-log>
         <management-interfaces>
-            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
+            <http-interface security-realm="ManagementRealm">
+                <http-upgrade enabled="true"/>
                 <socket-binding http="management-http"/>
             </http-interface>
         </management-interfaces>
-        <access-control provider="simple">
-            <role-mapping>
-                <role name="SuperUser">
-                    <include>
-                        <user name="$local"/>
-                    </include>
-                </role>
-            </role-mapping>
-        </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:2.0">
-            <use-deployment-logging-config value="false" />
+        <subsystem xmlns="urn:jboss:domain:logging:6.0">
+        	<use-deployment-logging-config value="false" />
             <add-logging-api-dependencies value="true" />
-
+        	
             <periodic-rotating-file-handler name="FILE"
                 autoflush="true">
                 <formatter>
@@ -133,6 +123,7 @@
                 <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" />
@@ -158,23 +149,14 @@
                 </handlers>
             </logger>
 
-            <logger
-                category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter"
-                use-parent-handlers="false">
+            <logger category="org.hibernate"
+            	use-parent-handlers="false">
                 <level name="INFO" />
                 <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-
-            <logger category="org.hibernate" 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>
@@ -185,7 +167,7 @@
             
             <logger category="org.hibernate.engine.internal.StatefulPersistenceContext">
                 <level name="ERROR"/>
-            </logger>            
+            </logger>
             
              <logger category="org.hibernate.hql.internal.ast.HqlSqlWalker">
                 <level name="ERROR"/>
@@ -227,18 +209,22 @@
                 <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">
                 <level name="WARN"/>
             </logger>
             
-            <logger category="org.apache.struts.tiles">
-                <level name="WARN"/>
+           	 <logger category="io.undertow.request">
+                <level name="INFO"/>
             </logger>
             
+            <logger category="org.springframework.web">
+                <level name="INFO"/>
+            </logger>
+            
             <root-logger>
                 <level name="DEBUG" />
                 <handlers>
@@ -247,30 +233,20 @@
                 </handlers>
             </root-logger>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false">
+				<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">convertToNull</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>
 				    
-				    <!-- 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>
@@ -305,58 +281,73 @@
             </datasources>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
-            <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}"/>
+            <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"/>
         </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"/>
+            <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: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:7.0">
             <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
-                <local-cache name="default" />
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
             </cache-container>
-            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="passivation" batching="true">
+            <cache-container name="web" default-cache="lams" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <local-cache name="persistent" batching="true">
-                    <file-store passivation="false" purge="false"/>
+  				<!-- 
+                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> 
+            </cache-container>
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
                 </local-cache>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps"/>
             </cache-container>
-			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+            <!-- LAMS configuration for Hibernate. At the moment the default one above is used.
+			<cache-container name="hibernate" module="org.hibernate">
                 <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"/>
@@ -366,10 +357,14 @@
                     <eviction strategy="LRU" max-entries="200"/>
                     <expiration max-idle="100000" lifespan="900000"/>
                 </local-cache>
-             -->
             </cache-container>
+             -->
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jca:2.0">
+        <subsystem xmlns="urn:jboss:domain:io:3.0">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <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>
@@ -388,40 +383,17 @@
             </default-workmanager>
             <cached-connection-manager/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
-            <expose-resolved-model/>
-            <expose-expression-model/>
-            <remoting-connector/>
-        </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:naming:2.0">
             <remote-naming/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
-            <endpoint worker="default"/>
+        <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:2.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>
-                        <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="lams" cache-type="default">
                     <authentication>
                         <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
@@ -431,31 +403,29 @@
                 </security-domain>
             </security-domains>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:2.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:1.2">
+        <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">
-                <http-listener name="default" socket-binding="http" max-post-size="104857600"/>
+                <http-listener name="default" socket-binding="http" enable-http2="true" max-post-size="209715200" />
                 <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"/>
-                            -->
+                	<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"/>
+                    -->
                 </host>
             </server>
-            <servlet-container name="default" default-encoding="UTF-8" disable-caching-for-secured-pages="false">
+ 			<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>
@@ -464,8 +434,6 @@
             </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="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
             </filters>
         </subsystem>
     </profile>
@@ -476,9 +444,6 @@
         <interface name="public">
             <inet-address value="${jboss.bind.address:127.0.0.1}"/>
         </interface>
-        <interface name="unsecure">
-            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
-        </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}"/>
@@ -488,8 +453,5 @@
         <socket-binding name="https" port="${jboss.https.port:8443}"/>
         <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"/>
-        </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>
\ No newline at end of file