Index: lams_build/build.xml
===================================================================
diff -u -rad2bffe5a612208bf6f2c9ce693f47aafd99d508 -r54db1f94b5b96a01027a117422122ab8d470b155
--- lams_build/build.xml	(.../build.xml)	(revision ad2bffe5a612208bf6f2c9ce693f47aafd99d508)
+++ lams_build/build.xml	(.../build.xml)	(revision 54db1f94b5b96a01027a117422122ab8d470b155)
@@ -18,18 +18,12 @@
 		Available targets are:
 		print-usage               --> Display this information
 		copy-tags                 --> Copies custom JSP tags from Central to all other projects
-		build-tool-deploy-utility --> Rebuilds Tool deployer and updates copy in lams_build
 		build-db                  --> Creates database tables and entries
-		deploy-ear                --> Builds and deploys LAMS EAR
 		deploy-ear-updater        --> Builds and deploys LAMS EAR for updater
-		deploy-tools              --> Standard Tool deployment
-		deploy-tools-minimal      --> Deploys only Tools required to run LAMS
-		deploy-tools-updater      --> Deploys Tools for updater
-		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
+		deploy-lams	              --> Runs full LAMS redeployment
+		deploy-lams-min-tools     --> Runs full LAMS redeployment with minimal Tools set
+		deploy-lams-min-tools     --> Runs full LAMS redeployment with full Tools set. Mainly for development.
+		slim-wildfly              --> Removes unused WidlFly files
 			
 		If you want to run full deployment, execute lams-cruise.
 		</echo>
@@ -64,12 +58,9 @@
 	<target name="_clean-tools">
 		<!-- Internal target: Removes output dirs of Tools -->
 		<ant antfile="../lams_tool_assessment/build.xml"    target="_clean-dirs" inheritAll="false"/>
-		<ant antfile="../lams_tool_bbb/build.xml"           target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_chat/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_daco/build.xml"          target="_clean-dirs" inheritAll="false"/>
-		<!--<ant antfile="../lams_tool_doku/build.xml"          target="_clean-dirs" inheritAll="false"/>-->
 		<ant antfile="../lams_tool_forum/build.xml"         target="_clean-dirs" inheritAll="false"/>
-		<ant antfile="../lams_tool_gmap/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_images/build.xml"        target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_imscc/build.xml"         target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_lamc/build.xml"          target="_clean-dirs" inheritAll="false"/>
@@ -87,30 +78,32 @@
 		<ant antfile="../lams_tool_task/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_vote/build.xml"          target="_clean-dirs" inheritAll="false"/>
 		<ant antfile="../lams_tool_wiki/build.xml"          target="_clean-dirs" inheritAll="false"/>
-		<ant antfile="../lams_tool_kaltura/build.xml"       target="_clean-dirs" inheritAll="false"/>
+		
 		<!-- 
+			<ant antfile="../lams_tool_kaltura/build.xml"       target="_clean-dirs" inheritAll="false" />
 			<ant antfile="../lams_tool_eadventure/build.xml"    target="_clean-dirs" inheritAll="false"/>
 			<ant antfile="../lams_tool_videorecorder/build.xml" target="_clean-dirs" inheritAll="false"/>
 			<ant antfile="../lams_tool_wookie/build.xml"    	target="_clean-dirs" inheritAll="false"/>
+			<ant antfile="../lams_tool_bbb/build.xml"           target="_clean-dirs" inheritAll="false" />
+			<ant antfile="../lams_tool_dimdim/build.xml"        target="_clean-dirs" inheritAll="false" />
+			<ant antfile="../lams_tool_gmap/build.xml"          target="_clean-dirs" inheritAll="false" />
+			
+			<ant antfile="../lams_tool_doku/build.xml"          target="_clean-dirs" inheritAll="false" />
+			<ant antfile="../lams_tool_zoom/build.xml"          target="_clean-dirs" inheritAll="false" />
+			<ant antfile="../lams_tool_preview/build.xml"       target="_clean-dirs" inheritAll="false" />
 		-->
 	</target>
 	
-	
-	<target name="clean-all" depends="_clean-core, _clean-tools" 
-		    description="Removes output dirs of Core projects and Tools (used for CruiseControl instance)" />
-
-	
 	<target name="copy-tags" description="Copies lams.tld and LAMS Tags from lams-central to other projects.">
 		<ant antfile="../lams_admin/build.xml"              target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_learning/build.xml"           target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_monitoring/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_gradebook/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_www/build.xml"                target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_assessment/build.xml"    target="copy-tags" inheritAll="false"/>
-		<ant antfile="../lams_tool_bbb/build.xml"           target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_chat/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_daco/build.xml"          target="copy-tags" inheritAll="false"/>
-		<!--<ant antfile="../lams_tool_doku/build.xml"          target="copy-tags" inheritAll="false"/>-->
+		<ant antfile="../lams_tool_doku/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_forum/build.xml"         target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_gmap/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_images/build.xml"        target="copy-tags" inheritAll="false"/>
@@ -123,6 +116,7 @@
 		<ant antfile="../lams_tool_mindmap/build.xml"       target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_notebook/build.xml"      target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_pixlr/build.xml"         target="copy-tags" inheritAll="false"/>
+		<ant antfile="../lams_tool_preview/build.xml"       target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_sbmt/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_scratchie/build.xml"     target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_scribe/build.xml"        target="copy-tags" inheritAll="false"/>
@@ -131,26 +125,22 @@
 		<ant antfile="../lams_tool_task/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_vote/build.xml"          target="copy-tags" inheritAll="false"/>
 		<ant antfile="../lams_tool_wiki/build.xml"          target="copy-tags" inheritAll="false"/>
-		<ant antfile="../lams_tool_kaltura/build.xml"       target="copy-tags" inheritAll="false"/>
+		<ant antfile="../lams_tool_zoom/build.xml"          target="copy-tags" inheritAll="false"/>
+		
 		<!-- 
+			<ant antfile="../lams_tool_kaltura/build.xml"       target="copy-tags" inheritAll="false" />
 			<ant antfile="../lams_tool_eadventure/build.xml"    target="copy-tags" inheritAll="false"/>
 			<ant antfile="../lams_tool_videorecorder/build.xml" target="copy-tags" inheritAll="false"/>
 			<ant antfile="../lams_tool_wookie/build.xml"    	target="copy-tags" inheritAll="false"/>
+			<ant antfile="../lams_tool_bbb/build.xml"           target="copy-tags" inheritAll="false" />
+			<ant antfile="../lams_tool_dimdim/build.xml"        target="copy-tags" inheritAll="false" />
+			<ant antfile="../lams_tool_gmap/build.xml"          target="copy-tags" inheritAll="false" />
 		-->
-		<echo>MANUALLY COPY TAGS TO UNLISTED PROJECTS:
-			  Kaltura and other public and private tools</echo>
+		<echo>MANUALLY COPY TAGS TO UNLISTED PROJECTS</echo>
 	</target>
 
 	
 	<target name="build-db" description="Rebuilds LAMS Database.">
-		<echo>Copying embedded MySQL drivers to library dir, if available</echo>
-		<copy todir="../lams_build/lib/mysql" overwrite="false" verbose="true">
-			<fileset dir="../mysql_embedded/connectors" erroronmissingdir="false">
-				<include name="*-driver.jar" />
-				<include name="*-db-files-${osPropertiesName}.jar" />
-			</fileset>
-		</copy>
-		
 		<ant antfile="../lams_common/build.xml" target="build-db" inheritAll="false" />
 	</target>
 	
@@ -243,7 +233,7 @@
 	</target>
 
 	
-	<target name="deploy-ear" depends="_build-ear" description="Deploys EAR.">
+	<target name="_deploy-ear" depends="_build-ear">
 		<echo>Deploying EAR</echo>
 		<delete dir="${server.home}/standalone/deployments/lams.ear"/>
 		<copy todir="${server.home}/standalone/deployments/lams.ear">
@@ -261,23 +251,12 @@
 		</copy>
 	</target>
 
-	
-	<target name="deploy-tools-minimal" description="Deploys minimal set of Tools.">
-		<echo>Deploying minimal set of Tools</echo>
-  		<ant antfile="../lams_tool_notebook/build.xml" target="deploy-tool" inheritAll="false" />
-		<ant antfile="../lams_tool_wiki/build.xml" 	 target="deploy-tool" inheritAll="false" />
-	</target>
-	
-	
 	<target name="_deploy-tools">
 		<echo>Deploying Tools</echo>
 		<ant antfile="../lams_tool_assessment/build.xml"    target="deploy-tool" inheritAll="false" />
-		<ant antfile="../lams_tool_bbb/build.xml"           target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_chat/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_daco/build.xml"          target="deploy-tool" inheritAll="false" />
-		<!--<ant antfile="../lams_tool_doku/build.xml"          target="deploy-tool" inheritAll="false" />-->
 		<ant antfile="../lams_tool_forum/build.xml"         target="deploy-tool" inheritAll="false" />
-		<ant antfile="../lams_tool_gmap/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_images/build.xml"        target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_imscc/build.xml"         target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_lamc/build.xml"          target="deploy-tool" inheritAll="false" />
@@ -296,19 +275,23 @@
   		<ant antfile="../lams_tool_task/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_vote/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../lams_tool_wiki/build.xml"          target="deploy-tool" inheritAll="false" />
-		<ant antfile="../lams_tool_kaltura/build.xml"       target="deploy-tool" inheritAll="false" />
+		
 		<!-- 
+			<ant antfile="../lams_tool_kaltura/build.xml"       target="deploy-tool" inheritAll="false" />
 			<ant antfile="../lams_tool_eadventure/build.xml"    target="deploy-tool" inheritAll="false"/>
 			<ant antfile="../lams_tool_videorecorder/build.xml" target="deploy-tool" inheritAll="false"/>
 			<ant antfile="../lams_tool_wookie/build.xml"    	target="deploy-tool" inheritAll="false"/>
+			<ant antfile="../lams_tool_bbb/build.xml"           target="deploy-tool" inheritAll="false" />
+			<ant antfile="../lams_tool_dimdim/build.xml"        target="deploy-tool" inheritAll="false" />
+			<ant antfile="../lams_tool_gmap/build.xml"          target="deploy-tool" inheritAll="false" />
+			
+			<ant antfile="../lams_tool_doku/build.xml"          target="deploy-tool" inheritAll="false" />
+			<ant antfile="../lams_tool_zoom/build.xml"          target="deploy-tool" inheritAll="false" />
+			<ant antfile="../lams_tool_preview/build.xml"       target="deploy-tool" inheritAll="false" />
 		-->
 	</target>
 	
 
-	<target name="deploy-tools" depends="_deploy-tools, deploy-learning-libraries" 
-		    description="Deploys LAMS Tools and special parallel activities." />
-
-	
 	<target name="_deploy-learning-library">
 		<!-- Internal target: Deploys a parallel activity. -->
 		
@@ -369,7 +352,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>
@@ -387,8 +370,7 @@
 	</target>
 	
 	
-	<target name="deploy-learning-libraries"
-		    description="Builds and deploys parallel and other complex activities. Can be done only after Tools are deployed">
+	<target name="_deploy-learning-libraries">
 		<echo>${ant.project.name}: Deploying Library Activities</echo>
 
 		<echo>Generating deployment package for share resources / forum parallel activity</echo>
@@ -428,8 +410,14 @@
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/xmlbeans/main/module.xml"
 			  file="lib/apache-poi/xmlbeans.module.xml" overwrite="true" verbose="true" />
 		
+		<copy todir="${server.home}/modules/system/layers/base/org/apache/batik/main" overwrite="true" verbose="true">
+			<fileset dir="lib/batik">
+				<include name="batik-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/apache/batik/main/module.xml"
+			file="lib/batik/batik.module.xml" overwrite="true" verbose="true" />
 		
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/imsglobal/main" overwrite="true" verbose="true">
 			<fileset dir="lib/basiclti-util">
 				<include name="basiclti-util-*.jar" />
@@ -464,8 +452,14 @@
 		<copy tofile="${server.home}/modules/system/layers/base/net/fckeditor/main/module.xml"
 			  file="lib/fckeditor/fckeditor.module.xml" overwrite="true" verbose="true" />
 		
+		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/collections4/main" overwrite="true" verbose="true">
+			<fileset dir="lib/jakarta-commons">
+				<include name="commons-collections4-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/apache/commons/collections4/main/module.xml"
+			  file="lib/jakarta-commons/collections4.module.xml" overwrite="true" verbose="true" />
 		
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/apache/commons/digester/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jakarta-commons">
 				<include name="commons-digester-*.jar" />
@@ -484,57 +478,32 @@
 			
 		<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"
-			  file="lib/jdk/jdk.module.xml" overwrite="true" verbose="true" />
-		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/scilab/forge/jlatexmath/main" overwrite="true" verbose="true">
 			<fileset dir="lib/jlatexmath">
 				<include name="jlatexmath-*.jar" />
 			</fileset>
 		</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" />
@@ -552,17 +521,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" />
@@ -593,32 +551,6 @@
 		
 		
 		
-		<copy todir="${server.home}/modules/system/layers/base/org/apache/oro/main" overwrite="true" verbose="true">
-			<fileset dir="lib/struts">
-				<include name="jakarta-oro.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/apache/oro/main/module.xml"
-			  file="lib/struts/jakarta-oro.module.xml" overwrite="true" verbose="true" />
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/apache/struts/main" overwrite="true" verbose="true">
-			<fileset dir="lib/struts">
-				<include name="struts.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/apache/struts/main/module.xml"
-			  file="lib/struts/struts.module.xml" overwrite="true" verbose="true" />
-		
-		<copy todir="${server.home}/modules/system/layers/base/org/apache/strutsel/main" overwrite="true" verbose="true">
-			<fileset dir="lib/struts">
-				<include name="struts-el.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/apache/strutsel/main/module.xml"
-			  file="lib/struts/struts-el.module.xml" overwrite="true" verbose="true" />
-		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/tuckey/urlrewritefilter/main" overwrite="true" verbose="true">
 			<fileset dir="lib/urlrewritefilter">
 				<include name="urlrewritefilter-*.jar" />
@@ -638,6 +570,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" />
@@ -648,17 +581,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" />
@@ -673,21 +595,6 @@
 		<antcall target="_deploy-standalone-config" />
 		<antcall target="_deploy-standalone-config-slimmed" />
 		
-		<!-- Backup and DELETE org/wildfly/clustering/web/undertow module. This module is used by default
-		 (no reconfiguration possible) by Wildfly shared-session (LAMS SSO) to store web sessions as
-		 DistributableSessions with Infinispan cache. When this module is not present - InMemorySessionManager
-		 is used instead. DistributableSessions for shared-session are buggy under wildfly 8.2.0, we don't
-		 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">
-			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
-		</copy>
-		
-		<delete>
-			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
-		</delete>
-		
 		<!-- Mark EAR for WildFly deployment -->
 		<delete >
 			<fileset dir="${server.home}/standalone/deployments" includes="lams.ear.*"/>
@@ -708,9 +615,9 @@
 			<fileset file="${conf.dir}/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<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>
@@ -721,9 +628,9 @@
 			<fileset file="${conf.dir}/slim/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<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>
@@ -735,12 +642,9 @@
 		<ant antfile="../lams_admin/build.xml"              target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_gradebook/build.xml"          target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_assessment/build.xml"    target="explode-war" inheritAll="false" />
-		<ant antfile="../lams_tool_bbb/build.xml"           target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_chat/build.xml"          target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_daco/build.xml"          target="explode-war" inheritAll="false" />
-		<!--<ant antfile="../lams_tool_doku/build.xml"          target="explode-war" inheritAll="false" />-->
 		<ant antfile="../lams_tool_forum/build.xml"         target="explode-war" inheritAll="false" />
-		<ant antfile="../lams_tool_gmap/build.xml"          target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_images/build.xml"        target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_imscc/build.xml"         target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_lamc/build.xml"          target="explode-war" inheritAll="false" />
@@ -759,32 +663,54 @@
   		<ant antfile="../lams_tool_task/build.xml"          target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_vote/build.xml"          target="explode-war" inheritAll="false" />
 		<ant antfile="../lams_tool_wiki/build.xml"          target="explode-war" inheritAll="false" />
-		<ant antfile="../lams_tool_kaltura/build.xml"       target="explode-war" inheritAll="false" />
-		<ant antfile="../lams_tool_mindmap/build.xml"       target="explode-war" inheritAll="false" />
 		<!-- 
+			<ant antfile="../lams_tool_kaltura/build.xml"       target="explode-war" inheritAll="false" />
 			<ant antfile="../lams_tool_eadventure/build.xml"    target="explode-war" inheritAll="false"/>
 			<ant antfile="../lams_tool_videorecorder/build.xml" target="explode-war" inheritAll="false"/>
 			<ant antfile="../lams_tool_wookie/build.xml"    	target="explode-war" inheritAll="false"/>
+			<ant antfile="../lams_tool_bbb/build.xml"           target="explode-war" inheritAll="false" />
+			<ant antfile="../lams_tool_dimdim/build.xml"        target="explode-war" inheritAll="false" />
+			<ant antfile="../lams_tool_gmap/build.xml"          target="explode-war" inheritAll="false" />
+			
+			<ant antfile="../lams_tool_doku/build.xml"          target="explode-war" inheritAll="false" />
+			<ant antfile="../lams_tool_zoom/build.xml"          target="explode-war" inheritAll="false" />
+			<ant antfile="../lams_tool_preview/build.xml"       target="explode-war" inheritAll="false" />
 		-->
 	</target>
 	
 	
 	<!-- cruise control task : build lams -->
-	<target name="lams-cruise" depends="_build-ear, build-db, deploy-ear, _deploy-resources, deploy-tools"
-		    description="Builds entire LAMS (used for CruiseControl instance)" />
+	<target name="deploy-lams" depends="_build-ear, build-db, _deploy-ear, _deploy-resources, _deploy-tools, _deploy-learning-libraries"
+		    description="Builds entire LAMS" />
 	
 	
 	<!-- cruise control task : build lams without tools -->
-	<target name="lams-cruise-min-tools" depends="_build-ear, build-db, deploy-ear, _deploy-resources, deploy-tools-minimal"
-	        description="Builds entire LAMS without tools (used for CruiseControl instance)" />
+	<target name="deploy-lams-min-tools" depends="_build-ear, build-db, _deploy-ear, _deploy-resources"
+	        description="Builds entire LAMS without tools">
+		<echo>${ant.project.name}: Deploying minimal set of Tools</echo>
+  		<ant antfile="../lams_tool_notebook/build.xml" target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_wiki/build.xml" 	 target="deploy-tool" inheritAll="false" />
+	</target>
 	
+	<target name="deploy-lams-all-tools" depends="_build-ear, build-db, _deploy-ear, _deploy-resources, _deploy-tools, _deploy-learning-libraries"
+		    description="Builds entire LAMS with all tools including optional ones and stubs. Mainly for development.">
+		<echo>${ant.project.name}: Deploying optional set of Tools</echo>
+		<ant antfile="../lams_tool_kaltura/build.xml"       target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_eadventure/build.xml"    target="deploy-tool" inheritAll="false"/>
+		<ant antfile="../lams_tool_videorecorder/build.xml" target="deploy-tool" inheritAll="false"/>
+		<ant antfile="../lams_tool_wookie/build.xml"    	target="deploy-tool" inheritAll="false"/>
+		<ant antfile="../lams_tool_bbb/build.xml"           target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_dimdim/build.xml"        target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_gmap/build.xml"          target="deploy-tool" inheritAll="false" />
+		
+		<ant antfile="../lams_tool_doku/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_zoom/build.xml"          target="deploy-tool" inheritAll="false" />
+		<ant antfile="../lams_tool_preview/build.xml"       target="deploy-tool" inheritAll="false" />
+	</target>
+	
+	
 	<!-- cruise control task : build lams -->
 	<target name="deploy-cluster" description="Prepare cluster environment">
-		<echo>${ant.project.name}: Restoring clustering library</echo>
-		<copy todir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow"
-			  overwrite="false" verbose="true">
-			<fileset dir="${server.home}/backup/undertow" />
-		</copy>
 		
 		<echo>${ant.project.name}: Copying configuration files</echo>
 		<copy todir="${server.home}/domain/configuration" overwrite="true" verbose="true">
@@ -794,9 +720,9 @@
 			</fileset>
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<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,8 +750,9 @@
 		/>
 	</target>
 	
-
-	<target name="slim-wildfly" description="Removes unnecessary files from Wildfly 8.2; do not run twice!">
+	
+	<target name="slim-standalone"
+			description="Removes unnecessary files from Wildfly 14.0.1 STANDALONE mode; do not run for domain mode!">
 		<delete includeemptydirs="true" verbose="true" failonerror="false">
 			<!-- Domain version of server. Standalone is used. -->
 			<fileset dir="${server.home}/domain/" />
@@ -834,60 +761,93 @@
 			<!-- Binaries -->
 			<fileset dir="${server.home}/bin/">
 				<include name="client/"/>
-				<include name="init.d/"/>
-				<include name="service/"/>
 				<include name=".jbossclirc"/>
 				<include name="add*"/>
 				<include name="appclient*"/>
+				<include name="jboss-cli*"/>
 				<include name="jconsole*"/>
 				<include name="jdr*"/>
 				<include name="domain*"/>
-				<include name="jboss-cli*"/>
-				<include name="run*"/>
+				<include name="elytron*"/>
+				<include name="launcher.jar"/>
+				<include name="product.conf"/>
 				<include name="vault*"/>
+				<include name="wildfly-elytron-tool.jar"/>
 				<include name="ws*"/>
+				<include name="*.ps1"/>
 			</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/"/>
+				<include name="com/googlecode/"/>
 				<include name="com/h2database/"/>
+				<include name="com/jcraft/"/>
+				<include name="com/microsoft/"/>
+				<include name="com/squareup/"/>
+				<include name="com/sun/jsf-impl/"/>
 				<include name="gnu/"/>
+				<include name="io/agroal/"/>
+				<include name="io/jaegertr/"/>
+				<include name="io/opentracing/"/>
+				<include name="io/smallrye/"/>
+				<include name="javax/faces/"/>
+				<include name="nu/"/>
 				<include name="org/apache/avro/"/>
-				<include name="org/apache/lucene/main/"/>
+				<include name="org/apache/commons/lang3/"/>
+				<include name="org/apache/james/"/>
+				<include name="org/apache/lucene/"/>
+				<include name="org/apache/neethi/"/>
 				<include name="org/apache/openjpa/"/>
-				<include name="org/codehaus/jackson/"/>
+				<include name="org/apache/santuario/"/>
+				<include name="org/apache/qpid/"/>
+				<include name="org/apache/thrift/"/>
+				<include name="org/apache/velocity/"/>
+				<include name="org/apache/xml-resolver/"/>
 				<include name="org/codehaus/jettison/"/>
-				<include name="org/eclipse/"/>
-				<include name="org/hibernate/3/"/>
+				<include name="org/eclipse/microprofile/"/>
+				<include name="org/eclipse/persistence/"/>
+				<include name="org/eclipse/yasson/"/>
+				<include name="org/fusesource/"/>
+				<include name="org/glassfish/soteria/"/>
 				<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/jipijapa-hibernate5/"/>
 				<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/hornetq/"/>
+				<include name="org/infinispan/cachestore/"/>
 				<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/"/>
 				<include name="org/jboss/as/cmp/"/>
+				<include name="org/jboss/as/configadmin/"/>
 				<include name="org/jboss/as/domain-add-user/"/>
+				<include name="org/jboss/as/domain-http-error-context/"/>
+				<include name="org/jboss/as/jacorb/"/>
 				<include name="org/jboss/as/jaxr/"/>
 				<include name="org/jboss/as/jaxrs/"/>
 				<include name="org/jboss/as/jdr/"/>
 				<include name="org/jboss/as/jpa/hibernate/"/>
+				<include name="org/jboss/as/jsf/"/>
+				<include name="org/jboss/as/jsf-injection/"/>
 				<include name="org/jboss/as/jsr77/"/>
 				<include name="org/jboss/as/mail/"/>
+				<include name="org/jboss/as/management-client-content/"/>
 				<include name="org/jboss/as/modcluster/"/>
+				<include name="org/jboss/as/patching/"/>
 				<include name="org/jboss/as/pojo/"/>
 				<include name="org/jboss/as/sar/"/>
 				<include name="org/jboss/as/security-api/"/>
 				<include name="org/jboss/as/webservices/"/>
 				<include name="org/jboss/as/vault-tool/"/>
-				<include name="org/jboss/as/version/main/jboss-as-version-8.1.0.Final.jar/"/>
 				<include name="org/jboss/as/xts/"/>
 				<include name="org/jboss/genericjms/"/>
 				<include name="org/jboss/integration/"/>
@@ -896,38 +856,49 @@
 				<include name="org/jboss/remoting3/"/>
 				<include name="org/jboss/resteasy/jose-jwt/"/>
 				<include name="org/jboss/resteasy/resteasy-atom-provider/"/>
+				<include name="org/jboss/resteasy/resteasy-cdi/"/>
 				<include name="org/jboss/resteasy/resteasy-crypto/"/>
 				<include name="org/jboss/resteasy/resteasy-jackson2-provider/"/>
 				<include name="org/jboss/resteasy/resteasy-jackson-provider/"/>
 				<include name="org/jboss/resteasy/resteasy-jettison-provider/"/>
+				<include name="org/jboss/resteasy/resteasy-jaxb-provider/"/>
 				<include name="org/jboss/resteasy/resteasy-jsapi/"/>
+				<include name="org/jboss/resteasy/resteasy-json-binding-provider/"/>
 				<include name="org/jboss/resteasy/resteasy-json-p-provider/"/>
 				<include name="org/jboss/resteasy/resteasy-multipart-provider/"/>
+				<include name="org/jboss/resteasy/resteasy-rxjava2/"/>
 				<include name="org/jboss/resteasy/resteasy-spring/"/>
 				<include name="org/jboss/resteasy/resteasy-yaml-provider/"/>
-				<include name="org/jboss/shrinkwrap/"/>
+				<include name="org/jboss/resteasy/resteasy-validator-provider-11/"/>
+				<include name="org/jboss/security/xacml/"/>
 				<include name="org/jboss/ws/saaj-impl/"/>
 				<include name="org/jboss/ws/tools/"/>
-				<include name="org/jboss/xb/"/>
-				<include name="org/osgi/"/>
+				<include name="org/jsoup/"/>
+				<include name="org/opensaml/"/>
 				<include name="org/picketlink/"/>
 				<include name="org/wildfly/extension/batch/"/>
+				<include name="org/wildfly/extension/datasources-agroal/"/>
+				<include name="org/wildfly/extension/discovery/"/>
+				<include name="org/wildfly/extension/ee-security/"/>
+				<include name="org/wildfly/extension/elytron/"/>
+				<include name="org/wildfly/extension/messaging-activemq/"/>
+				<include name="org/wildfly/extension/microprofile/"/>
 				<include name="org/wildfly/extension/mod_cluster/"/>
+				<include name="org/wildfly/extension/picketlink/"/>
 				<include name="org/wildfly/extension/rts/"/>
-				<include name="org/wildfly/jberet/"/>
+				<include name="org/wildfly/microprofile/"/>
 				<include name="org/wildfly/mod_cluster/"/>
 				<include name="org/yaml/"/>
 			</fileset>
 			<!-- Default content -->
 			<fileset dir="${server.home}">
-				<include name="welcome-content/" />
+				<include name="README.txt" />
 			</fileset>
 			<!-- Other -->
 			<fileset dir="${server.home}/standalone/deployments/">
 				<include name="README.txt"/>
 			</fileset>
 			<fileset dir="${server.home}/docs/" />
-			<fileset dir="${server.home}/.installation/" />
 		</delete>
 	</target>
 </project>
\ No newline at end of file