Index: lams_build/common.properties
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/common.properties	(.../common.properties)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_build/common.properties	(.../common.properties)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -18,7 +18,7 @@
 #   http://www.gnu.org/licenses/gpl.txt  
 
 # put into EAR MANIFEST.MF file
-project.version=3.0
+project.version=3.1
 
 # is HTTPS in use? if so, set it to true, so JSESSIONID cookie is secured
 secure.cookie=false
Index: lams_build/conf/j2ee/application.xml
===================================================================
diff -u -r88eacf1b7b5cfaa01f2e83d349454e77dd8d6e4f -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 88eacf1b7b5cfaa01f2e83d349454e77dd8d6e4f)
+++ lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<application xmlns="http://java.sun.com/xml/ns/javaee"
+<application xmlns="http://xmlns.jcp.org/xml/ns/javaee"
 			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			 version="6"
-			 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd">
+			 version="7"
+			 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd">
     <display-name>LAMS</display-name>
   
 	    
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -rb5478988ead895a4e792f05f66f4c77de0b9997b -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision b5478988ead895a4e792f05f66f4c77de0b9997b)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -1,4 +1,4 @@
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.3">
   <!-- Make sub deployments not isolated, so they can see each others classes without a Class-Path entry -->
   <ear-subdeployments-isolated>false</ear-subdeployments-isolated>
   <deployment>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -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"/>
@@ -67,7 +67,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" />
 
@@ -192,7 +192,8 @@
                 </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" />
@@ -271,9 +272,9 @@
                 </handlers>
             </root-logger>
         </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">
+                <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>
@@ -331,7 +332,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>
@@ -353,19 +354,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"/>
@@ -393,7 +403,7 @@
              -->
             </cache-container>
         </subsystem>
-        <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>
@@ -424,11 +434,11 @@
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
-        <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:security:1.2">
             <security-domains>
                 <security-domain name="other" cache-type="default">
@@ -463,7 +473,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="104857600"/>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -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" />
 
@@ -290,7 +290,7 @@
                 <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>
@@ -350,7 +350,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>
@@ -372,19 +372,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"/>
@@ -413,7 +422,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>
@@ -451,11 +460,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>
@@ -491,7 +500,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="104857600"/>
@@ -520,7 +529,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">
@@ -530,7 +539,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">
Index: lams_build/lib/apache-poi/poi.module.xml
===================================================================
diff -u -r1784e59435d667f67703cba9fb72267f65dfd031 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/apache-poi/poi.module.xml	(.../poi.module.xml)	(revision 1784e59435d667f67703cba9fb72267f65dfd031)
+++ lams_build/lib/apache-poi/poi.module.xml	(.../poi.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.poi">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.poi">
   <resources>
     <resource-root path="poi-3.10-FINAL-20140208.jar"/>
     <resource-root path="poi-ooxml-3.10-FINAL-20140208.jar"/>
Index: lams_build/lib/apache-poi/xmlbeans.module.xml
===================================================================
diff -u -r1784e59435d667f67703cba9fb72267f65dfd031 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/apache-poi/xmlbeans.module.xml	(.../xmlbeans.module.xml)	(revision 1784e59435d667f67703cba9fb72267f65dfd031)
+++ lams_build/lib/apache-poi/xmlbeans.module.xml	(.../xmlbeans.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.xmlbeans">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.xmlbeans">
   <resources>
     <resource-root path="xmlbeans-2.3.0.jar"/>
   </resources>
Index: lams_build/lib/basiclti-util/basiclti-util.module.xml
===================================================================
diff -u -r52d377c32c9955f9f7f4781dcdd634c1a069d2e1 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/basiclti-util/basiclti-util.module.xml	(.../basiclti-util.module.xml)	(revision 52d377c32c9955f9f7f4781dcdd634c1a069d2e1)
+++ lams_build/lib/basiclti-util/basiclti-util.module.xml	(.../basiclti-util.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.imsglobal">
+<module xmlns="urn:jboss:module:1.5" name="org.imsglobal">
   <resources>
     <resource-root path="basiclti-util-1.2.0.jar"/>
   </resources>
Index: lams_build/lib/basiclti-util/oauth.module.xml
===================================================================
diff -u -raffd6427190109b30d84b75bcaf028c01b03cd19 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/basiclti-util/oauth.module.xml	(.../oauth.module.xml)	(revision affd6427190109b30d84b75bcaf028c01b03cd19)
+++ lams_build/lib/basiclti-util/oauth.module.xml	(.../oauth.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="net.oauth.core">
+<module xmlns="urn:jboss:module:1.5" name="net.oauth.core">
   <resources>
     <resource-root path="oauth-20100527.jar"/>
     <resource-root path="oauth-provider-20100527.jar"/>
Index: lams_build/lib/basiclti-util/signpost.module.xml
===================================================================
diff -u -r37286da230b2bacd7f7764d630c639c6b51dcf24 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/basiclti-util/signpost.module.xml	(.../signpost.module.xml)	(revision 37286da230b2bacd7f7764d630c639c6b51dcf24)
+++ lams_build/lib/basiclti-util/signpost.module.xml	(.../signpost.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="oauth.signpost">
+<module xmlns="urn:jboss:module:1.5" name="oauth.signpost">
   <resources>
     <resource-root path="signpost-commonshttp4-1.2.1.2.jar"/>
     <resource-root path="signpost-core-1.2.1.2.jar"/>
Index: lams_build/lib/fckeditor/fckeditor.module.xml
===================================================================
diff -u -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/fckeditor/fckeditor.module.xml	(.../fckeditor.module.xml)	(revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
+++ lams_build/lib/fckeditor/fckeditor.module.xml	(.../fckeditor.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="net.fckeditor">
+<module xmlns="urn:jboss:module:1.5" name="net.fckeditor">
   <resources>
     <resource-root path="fckeditor-java-core-2.6.jar"/>
   </resources>
Index: lams_build/lib/googleauth/googleauth.module.xml
===================================================================
diff -u -r37286da230b2bacd7f7764d630c639c6b51dcf24 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/googleauth/googleauth.module.xml	(.../googleauth.module.xml)	(revision 37286da230b2bacd7f7764d630c639c6b51dcf24)
+++ lams_build/lib/googleauth/googleauth.module.xml	(.../googleauth.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.warrenstrange.googleauth">
+<module xmlns="urn:jboss:module:1.5" name="com.warrenstrange.googleauth">
   <resources>
     <resource-root path="googleauth-1.1.1.jar"/>
   </resources>
Index: lams_build/lib/jakarta-commons/digester.module.xml
===================================================================
diff -u -rf08f6c4324d6ce0ca8dc43b875a498d89dd91116 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jakarta-commons/digester.module.xml	(.../digester.module.xml)	(revision f08f6c4324d6ce0ca8dc43b875a498d89dd91116)
+++ lams_build/lib/jakarta-commons/digester.module.xml	(.../digester.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.digester">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.digester">
   <resources>
     <resource-root path="commons-digester-2.1.jar"/>
   </resources>
Index: lams_build/lib/jakarta-commons/discovery.module.xml
===================================================================
diff -u -r8255ca2a3637e4615eb9ae6983d789b46eb6cc2f -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jakarta-commons/discovery.module.xml	(.../discovery.module.xml)	(revision 8255ca2a3637e4615eb9ae6983d789b46eb6cc2f)
+++ lams_build/lib/jakarta-commons/discovery.module.xml	(.../discovery.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.discovery">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.discovery">
   <resources>
     <resource-root path="commons-discovery-0.5.jar"/>
   </resources>
Index: lams_build/lib/jakarta-commons/fileupload.module.xml
===================================================================
diff -u -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
+++ lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.fileupload">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.fileupload">
   <resources>
     <resource-root path="commons-fileupload.jar"/>
   </resources>  
Index: lams_build/lib/jakarta-commons/validator.module.xml
===================================================================
diff -u -r50cda3f7b8598d1e7dfd24e1c1fd84256184303d -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 50cda3f7b8598d1e7dfd24e1c1fd84256184303d)
+++ lams_build/lib/jakarta-commons/validator.module.xml	(.../validator.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.validator">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.validator">
   <resources>
     <resource-root path="commons-validator.jar"/>
   </resources>
Index: lams_build/lib/jboss/jbossweb.module.xml
===================================================================
diff -u -r16505c1a81af4d8a128af0a23fe1a7c39cc7e3e6 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jboss/jbossweb.module.xml	(.../jbossweb.module.xml)	(revision 16505c1a81af4d8a128af0a23fe1a7c39cc7e3e6)
+++ lams_build/lib/jboss/jbossweb.module.xml	(.../jbossweb.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.jbossweb">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.jbossweb">
   <resources>
     <resource-root path="jbossweb.jar"/>
   </resources>
Index: lams_build/lib/jdk/jdk.module.xml
===================================================================
diff -u -r43fb28f1f57447cfa8a9be6883c12e600f3fcf28 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jdk/jdk.module.xml	(.../jdk.module.xml)	(revision 43fb28f1f57447cfa8a9be6883c12e600f3fcf28)
+++ lams_build/lib/jdk/jdk.module.xml	(.../jdk.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="sun.jdk">
+<module xmlns="urn:jboss:module:1.5" name="sun.jdk">
     <resources>
         <!-- currently jboss modules has not way of importing services from
         classes.jar so we duplicate them here -->
Index: lams_build/lib/jlatexmath/jlatexmath.module.xml
===================================================================
diff -u -r907497546b00b271208dc152b4bc80cb487c37b6 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/jlatexmath/jlatexmath.module.xml	(.../jlatexmath.module.xml)	(revision 907497546b00b271208dc152b4bc80cb487c37b6)
+++ lams_build/lib/jlatexmath/jlatexmath.module.xml	(.../jlatexmath.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.scilab.forge.jlatexmath">
+<module xmlns="urn:jboss:module:1.5" name="org.scilab.forge.jlatexmath">
   <resources>
     <resource-root path="jlatexmath-1.0.3.jar"/>
   </resources>
Index: lams_build/lib/json/gson.module.xml
===================================================================
diff -u -r3c66af0ff2864b39302fa27cad676cc7ab277030 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/json/gson.module.xml	(.../gson.module.xml)	(revision 3c66af0ff2864b39302fa27cad676cc7ab277030)
+++ lams_build/lib/json/gson.module.xml	(.../gson.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.google.gson">
+<module xmlns="urn:jboss:module:1.5" name="com.google.gson">
   <resources>
     <resource-root path="gson-2.2.4.jar"/>
   </resources>
Index: lams_build/lib/json/json-simple.module.xml
===================================================================
diff -u -rb5478988ead895a4e792f05f66f4c77de0b9997b -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/json/json-simple.module.xml	(.../json-simple.module.xml)	(revision b5478988ead895a4e792f05f66f4c77de0b9997b)
+++ lams_build/lib/json/json-simple.module.xml	(.../json-simple.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.json.simple">
+<module xmlns="urn:jboss:module:1.5" name="org.json.simple">
   <resources>
     <resource-root path="json-simple-1.1.1.jar"/>
   </resources>
Index: lams_build/lib/lucene/lucene.module.xml
===================================================================
diff -u -re179b1c5a61d9aa11b2b3d9d741ad2674322aec4 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/lucene/lucene.module.xml	(.../lucene.module.xml)	(revision e179b1c5a61d9aa11b2b3d9d741ad2674322aec4)
+++ lams_build/lib/lucene/lucene.module.xml	(.../lucene.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.lucene" slot="4.10">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.lucene" slot="4.10">
   <resources>
     <resource-root path="lucene-core-4.10.2.jar"/>
     <resource-root path="lucene-analyzers-common-4.10.2.jar"/>
Index: lams_build/lib/mysql/mysql-connector-java.module.xml
===================================================================
diff -u -r345648e21e2c2b088c907ed812175477dd9b78f2 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/mysql/mysql-connector-java.module.xml	(.../mysql-connector-java.module.xml)	(revision 345648e21e2c2b088c907ed812175477dd9b78f2)
+++ lams_build/lib/mysql/mysql-connector-java.module.xml	(.../mysql-connector-java.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.mysql">
+<module xmlns="urn:jboss:module:1.5" name="com.mysql">
   <resources>
     <resource-root path="mysql-connector-java-5.1.38-bin.jar"/>
   </resources>
Index: lams_build/lib/quartz/quartz.module.xml
===================================================================
diff -u -rc208628989d52041b3765784f4c8cbfd6c80d47b -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/quartz/quartz.module.xml	(.../quartz.module.xml)	(revision c208628989d52041b3765784f4c8cbfd6c80d47b)
+++ lams_build/lib/quartz/quartz.module.xml	(.../quartz.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.quartz">
+<module xmlns="urn:jboss:module:1.5" name="org.quartz">
   <resources>
     <resource-root path="quartz-2.2.1.jar"/>
   </resources>
Index: lams_build/lib/spring/spring.module.xml
===================================================================
diff -u -rc0ff6b441af3e25ef2eebc07a1f19a766372c6d9 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision c0ff6b441af3e25ef2eebc07a1f19a766372c6d9)
+++ lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.springframework">
+<module xmlns="urn:jboss:module:1.5" name="org.springframework">
   <resources>
     <resource-root path="spring-core-4.0.6.RELEASE.jar"/>
     <resource-root path="spring-aop-4.0.6.RELEASE.jar"/>
Index: lams_build/lib/struts/jakarta-oro.module.xml
===================================================================
diff -u -r5fa7969704b59c54a44ada555d2c43578c7eb42d -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/struts/jakarta-oro.module.xml	(.../jakarta-oro.module.xml)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
+++ lams_build/lib/struts/jakarta-oro.module.xml	(.../jakarta-oro.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.oro">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.oro">
   <resources>
     <resource-root path="jakarta-oro.jar"/>
   </resources>
Index: lams_build/lib/struts/struts-el.module.xml
===================================================================
diff -u -r0239636bd4feb143ea632d48911635281144b704 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/struts/struts-el.module.xml	(.../struts-el.module.xml)	(revision 0239636bd4feb143ea632d48911635281144b704)
+++ lams_build/lib/struts/struts-el.module.xml	(.../struts-el.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.strutsel">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.strutsel">
   <resources>
     <resource-root path="struts-el.jar"/>
   </resources>
Index: lams_build/lib/struts/struts.module.xml
===================================================================
diff -u -r4845924e4c50c859a4e230872c3f1629f9224380 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/struts/struts.module.xml	(.../struts.module.xml)	(revision 4845924e4c50c859a4e230872c3f1629f9224380)
+++ lams_build/lib/struts/struts.module.xml	(.../struts.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.struts">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.struts">
   <resources>
     <resource-root path="struts.jar"/>
   </resources>
Index: lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml
===================================================================
diff -u -r59a988dff8aba3b12e983c76cd51da7c254f86f0 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml	(.../urlrewritefilter.module.xml)	(revision 59a988dff8aba3b12e983c76cd51da7c254f86f0)
+++ lams_build/lib/urlrewritefilter/urlrewritefilter.module.xml	(.../urlrewritefilter.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.tuckey.urlrewritefilter">
+<module xmlns="urn:jboss:module:1.5" name="org.tuckey.urlrewritefilter">
   <resources>
     <resource-root path="urlrewritefilter-4.0.3.jar"/>
   </resources>
Index: lams_build/lib/xml-commons/xmlcommons.module.xml
===================================================================
diff -u -r588990a275fb267ffafa8a1db076e1cc77ad48a7 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 588990a275fb267ffafa8a1db076e1cc77ad48a7)
+++ lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.xmlcommons">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.xmlcommons">
   <resources>
   	<resource-root path="xml-apis.jar">
   		<filter>
Index: lams_build/lib/xstream/xmlpull.module.xml
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/xstream/xmlpull.module.xml	(.../xmlpull.module.xml)	(revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_build/lib/xstream/xmlpull.module.xml	(.../xmlpull.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.xmlpull">
+<module xmlns="urn:jboss:module:1.5" name="org.xmlpull">
   <resources>
   	<resource-root path="xmlpull-1.1.3.1.jar"/>
   	<resource-root path="xpp3_min-1.1.4c.jar"/>
Index: lams_build/lib/xstream/xstream.module.xml
===================================================================
diff -u -ra4a61e7b65ede7f903eb08521a9455685ef9283d -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/lib/xstream/xstream.module.xml	(.../xstream.module.xml)	(revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
+++ lams_build/lib/xstream/xstream.module.xml	(.../xstream.module.xml)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.thoughtworks.xstream">
+<module xmlns="urn:jboss:module:1.5" name="com.thoughtworks.xstream">
   <resources>
     <resource-root path="xstream-1.5.0-SNAPSHOT.jar"/>
   </resources>
Index: lams_build/unix.properties
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/unix.properties	(.../unix.properties)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_build/unix.properties	(.../unix.properties)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -33,7 +33,7 @@
 contentrepository.base=/var/opt/lams
 
 #JBoss deploy directory (Unix)
-server.home=/usr/local/wildfly-8.2/
+server.home=/usr/local/wildfly-10.1/
 
 #Sass executable. 
 sass_exec_file=/usr/local/bin/sass
\ No newline at end of file
Index: lams_build/windows.properties
===================================================================
diff -u -r643db4d5a046de97aa13289f70d3ee92a4f4a8bf -r87b6dd451f89e2b103a6d111802fc2d7005946b6
--- lams_build/windows.properties	(.../windows.properties)	(revision 643db4d5a046de97aa13289f70d3ee92a4f4a8bf)
+++ lams_build/windows.properties	(.../windows.properties)	(revision 87b6dd451f89e2b103a6d111802fc2d7005946b6)
@@ -32,7 +32,7 @@
 contentrepository.base=C:/lams
 
 #JBoss deploy directory (Windows)
-server.home=C:/wildfly-8.2/
+server.home=C:/wildfly-10.1/
 
 #Sass executable. 
 sass_exec_file=C:/Program Files/Ruby/bin/sass.bat
\ No newline at end of file