Index: lams_build/conf/standalone.xml
===================================================================
diff -u -rf3204b638b1e3b4a91854b23464fa244ea6a17a1 -r344a7854d00abbb7a6bb0bb3756970234be71f76
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision f3204b638b1e3b4a91854b23464fa244ea6a17a1)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 344a7854d00abbb7a6bb0bb3756970234be71f76)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:2.2">
+<server xmlns="urn:jboss:domain:4.2">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -76,7 +76,7 @@
         </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:2.0">
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
             <use-deployment-logging-config value="false" />
             <add-logging-api-dependencies value="true" />
 
@@ -142,6 +142,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" />
@@ -167,16 +168,6 @@
                 </handlers>
             </logger>
 
-            <logger
-                category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter"
-                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" />
@@ -237,7 +228,7 @@
                 <level name="INFO"/>
             </logger>
             
-            <logger category="org.springframework.orm.hibernate4">
+            <logger category="org.springframework.orm.hibernate5">
                 <level name="INFO"/>
             </logger>
             
@@ -266,16 +257,18 @@
                 <keepalive-time time="30" unit="seconds"/>
             </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:2.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>
 				    <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="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>
@@ -326,7 +319,7 @@
         <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}"/>
         </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>
@@ -348,19 +341,28 @@
             <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" 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">
+                <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">
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
+                <local-cache name="concurrent">
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
             </cache-container>
-			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+			<cache-container name="hibernate" module="org.hibernate">
                 <local-cache name="entity" statistics-enabled="true">
                    <!-- 
                    	<transaction mode="NON_XA"/>
@@ -389,7 +391,7 @@
             </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>
@@ -427,11 +429,11 @@
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
             <endpoint worker="default"/>
             <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:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -467,7 +469,7 @@
             </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="209715200"/>
@@ -496,7 +498,7 @@
                 <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">
@@ -506,7 +508,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>
     <interfaces>
         <interface name="management">