Index: lams_build/build.xml
===================================================================
diff -u -r9bb615833c00a9139a689328ec07aaad8ee5cb16 -rb8e51289e8498d408a9379a64353ad9ca97e6fed
--- lams_build/build.xml	(.../build.xml)	(revision 9bb615833c00a9139a689328ec07aaad8ee5cb16)
+++ lams_build/build.xml	(.../build.xml)	(revision b8e51289e8498d408a9379a64353ad9ca97e6fed)
@@ -28,8 +28,7 @@
 		deploy-learning-libraries --> Deploys complex Tools
 		lams-cruise               --> Runs full LAMS redeployment
 		lams-cruise-min-tools     --> Runs full LAMS redeployment with minimal Tools set
-		slim-jboss                --> Removes unused JBoss files
-		slim-jboss-revert         --> Puts back JBoss files removed in slimming process
+		slim-wildfly              --> Removes unused WidlFly files
 			
 		If you want to run full deployment, execute lams-cruise.
 		</echo>
@@ -368,7 +367,7 @@
 			dbPassword="${db.password}"
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url.build}"
-			dbDriverClass="com.mysql.jdbc.Driver"	
+			dbDriverClass="com.mysql.cj.jdbc.Driver"	
 		/>
 	
 		<echo>Deploying language files</echo>
@@ -483,32 +482,21 @@
 			
 		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/fileupload/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jakarta-commons">
-				<include name="commons-fileupload.jar" />
+				<include name="commons-fileupload-*.jar" />
 			</fileset>
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/fileupload/main/module.xml"
 			  file="lib/jakarta-commons/fileupload.module.xml" overwrite="true" verbose="true" />
 		
 		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/validator/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jakarta-commons">
-				<include name="commons-validator.jar" />
+				<include name="commons-validator-*.jar" />
 			</fileset>
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/validator/main/module.xml"
 			  file="lib/jakarta-commons/validator.module.xml" overwrite="true" verbose="true" />
 		
 		
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/jboss/jbossweb/main" overwrite="true" verbose="true">
-			<fileset dir="lib/jboss">
-				<include name="jbossweb.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/jboss/jbossweb/main/module.xml"
-			  file="lib/jboss/jbossweb.module.xml" overwrite="true" verbose="true" />
-		
-		
-		
 		<!-- WildFly does not load all classes from JDK that LAMS needs (com/sun/org/apache/xerces/internal)
 		     We need our own, extended list -->
 		<copy tofile="${server.home}/modules/system/layers/base/sun/jdk/main/module.xml"
@@ -523,17 +511,9 @@
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/scilab/forge/jlatexmath/main/module.xml"
 			  file="lib/jlatexmath/jlatexmath.module.xml" overwrite="true" verbose="true" />
+
 		
 		
-		
-		<copy todir="${server.home}/modules/system/layers/base/com/google/gson/main" overwrite="true" verbose="true">
-			<fileset dir="lib/json">
-				<include name="gson-*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/com/google/gson/main/module.xml"
-			  file="lib/json/gson.module.xml" overwrite="true" verbose="true" />
-
 		<copy todir="${server.home}/modules/system/layers/base/org/json/simple/main" overwrite="true" verbose="true">
 			<fileset dir="lib/json">
 				<include name="json-simple-*.jar" />
@@ -551,17 +531,6 @@
 			  file="lib/json/jjwt.module.xml" overwrite="true" verbose="true" />
 		
 		
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/apache/lucene/4.10" overwrite="true" verbose="true">
-			<fileset dir="lib/lucene">
-				<include name="lucene-*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/apache/lucene/4.10/module.xml"
-			  file="lib/lucene/lucene.module.xml" overwrite="true" verbose="true" />
-		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/com/mysql/main" overwrite="true" verbose="true">
 			<fileset dir="lib/mysql">
 				<include name="mysql-connector-java-*.jar" />
@@ -637,6 +606,7 @@
 			  file="lib/googleauth/googleauth.module.xml" overwrite="true" verbose="true" />		
 		
 		
+		
 		<copy todir="${server.home}/modules/system/layers/base/org/apache/xmlcommons/main" overwrite="true" verbose="true">
 			<fileset dir="lib/xml-commons">
 				<include name="xml-apis*.jar" />
@@ -647,17 +617,6 @@
 		
 		
 		
-		<copy todir="${server.home}/modules/system/layers/base/org/xmlpull/main" overwrite="true" verbose="true">
-			<fileset dir="lib/xstream">
-				<include name="xmlpull-*.jar" />
-				<include name="xpp*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/xmlpull/main/module.xml"
-			  file="lib/xstream/xmlpull.module.xml" overwrite="true" verbose="true" />
-				
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/com/thoughtworks/xstream/main" overwrite="true" verbose="true">
 			<fileset dir="lib/xstream">
 				<include name="xstream-*.jar" />
@@ -679,11 +638,11 @@
 		 use them till migration to Wildfly 9.x
 		 It will be placed back if deploy-cluster is run. -->
 		<copy todir="${server.home}/backup/undertow"
-			  overwrite="false" verbose="true">
+			  overwrite="false" verbose="true" failonerror="false">
 			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
 		</copy>
 		
-		<delete>
+		<delete failonerror="false">
 			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
 		</delete>
 		
@@ -710,6 +669,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 	</target>
@@ -723,6 +683,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 	</target>
@@ -796,6 +757,7 @@
 	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
+	        	<filter token="db.timezone" value="${db.timezone}"/>
 	        </filterset>
 		</copy>
 		
@@ -824,7 +786,7 @@
 	</target>
 	
 
-	<target name="slim-wildfly" description="Removes unnecessary files from Wildfly 8.2; do not run twice!">
+	<target name="slim-wildfly" description="Removes unnecessary files from Wildfly 10.1; do not run twice!">
 		<delete includeemptydirs="true" verbose="true" failonerror="false">
 			<!-- Domain version of server. Standalone is used. -->
 			<fileset dir="${server.home}/domain/" />
@@ -845,30 +807,37 @@
 				<include name="run*"/>
 				<include name="vault*"/>
 				<include name="ws*"/>
+				<include name="*.ps1"/>
+				<include name="launcher.jar"/>
+				<include name="product.conf"/>
 			</fileset>
 			<!-- Config files -->
 			<fileset dir="${server.home}/standalone/configuration/">
 				<include name="standalone-*"/>
 			</fileset>
 			<!-- Libraries -->
 			<fileset dir="${server.home}/modules/system/layers/base/">
+				<include name="ch/"/>
+				<include name="com/google/guava/"/>
 				<include name="com/h2database/"/>
+				<include name="com/microsoft/"/>
 				<include name="gnu/"/>
+				<include name="nu/"/>
 				<include name="org/apache/avro/"/>
 				<include name="org/apache/lucene/main/"/>
+				<include name="org/apache/lucene/internal/"/>
 				<include name="org/apache/openjpa/"/>
-				<include name="org/codehaus/jackson/"/>
 				<include name="org/codehaus/jettison/"/>
-				<include name="org/eclipse/"/>
-				<include name="org/hibernate/3/"/>
+				<include name="org/eclipse/persistence/"/>
+				<include name="org/fusesource/"/>
 				<include name="org/hibernate/4.1/"/>
+				<include name="org/hibernate/4.3/"/>
+				<include name="org/hibernate/5.0/"/>
+				<include name="org/hibernate/jipijapa-hibernate4-3/"/>
 				<include name="org/hibernate/envers/"/>
 				<include name="org/hibernate/hql/"/>
 				<include name="org/hibernate/search/"/>
-				<include name="org/infinispan/lucene/"/>
-				<include name="org/infinispan/query/main/"/>
 				<include name="org/jberet/"/>
-				<include name="org/jboss/as/aggregate/"/>
 				<include name="org/jboss/as/appclient/"/>
 				<include name="org/jboss/as/clustering/ejb3/"/>
 				<include name="org/jboss/as/clustering/web/"/>
@@ -908,14 +877,17 @@
 				<include name="org/jboss/ws/saaj-impl/"/>
 				<include name="org/jboss/ws/tools/"/>
 				<include name="org/jboss/xb/"/>
+				<include name="org/jsoup/"/>
 				<include name="org/osgi/"/>
+				<include name="org/opensaml/"/>
 				<include name="org/picketlink/"/>
 				<include name="org/wildfly/extension/batch/"/>
 				<include name="org/wildfly/extension/mod_cluster/"/>
 				<include name="org/wildfly/extension/rts/"/>
 				<include name="org/wildfly/jberet/"/>
 				<include name="org/wildfly/mod_cluster/"/>
 				<include name="org/yaml/"/>
+				<include name="sun/scripting/"/>
 			</fileset>
 			<!-- Default content -->
 			<fileset dir="${server.home}">