Index: lams_build/build.xml
===================================================================
diff -u -rb8e51289e8498d408a9379a64353ad9ca97e6fed -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/build.xml	(.../build.xml)	(revision b8e51289e8498d408a9379a64353ad9ca97e6fed)
+++ lams_build/build.xml	(.../build.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -18,16 +18,11 @@
 		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
+		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.
@@ -63,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"/>
@@ -86,19 +78,22 @@
 		<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"/>
@@ -109,7 +104,7 @@
 		<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"/>
@@ -122,6 +117,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"/>
@@ -130,26 +126,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>
 	
@@ -241,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">
@@ -259,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" />
@@ -294,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. -->
 		
@@ -385,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>
@@ -462,7 +446,27 @@
 		<copy tofile="${server.home}/modules/system/layers/base/net/fckeditor/main/module.xml"
 			  file="lib/fckeditor/fckeditor.module.xml" overwrite="true" verbose="true" />
 		
+
 		
+		<delete dir="${server.home}/modules/system/layers/base/org/hibernate/main" />
+		<mkdir  dir="${server.home}/modules/system/layers/base/org/hibernate/main" />
+		<copy todir="${server.home}/modules/system/layers/base/org/hibernate/main" overwrite="true" verbose="true">
+			<fileset dir="lib/hibernate">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${server.home}/modules/system/layers/base/org/hibernate/main/module.xml"
+			  file="lib/hibernate/hibernate.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">
@@ -497,13 +501,7 @@
 			  file="lib/jakarta-commons/validator.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" />
@@ -561,32 +559,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" />
@@ -631,21 +603,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" failonerror="false">
-			<fileset dir="${server.home}/modules/system/layers/base/org/wildfly/clustering/web/undertow" />
-		</copy>
-		
-		<delete failonerror="false">
-			<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.*"/>
@@ -666,7 +623,6 @@
 			<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}"/>
@@ -680,7 +636,6 @@
 			<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}"/>
@@ -695,12 +650,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" />
@@ -719,32 +671,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">
@@ -754,7 +728,6 @@
 			</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}"/>
@@ -785,8 +758,10 @@
 		/>
 	</target>
 	
-
-	<target name="slim-wildfly" description="Removes unnecessary files from Wildfly 10.1; do not run twice!">
+	
+	<target name="slim-wildfly" description="Removes unnecessary files from Wildfly 14.0.1; do not run twice!">
+		<fail message="This has not been implemented yet" />
+		
 		<delete includeemptydirs="true" verbose="true" failonerror="false">
 			<!-- Domain version of server. Standalone is used. -->
 			<fileset dir="${server.home}/domain/" />