Index: lams_tool_chat/build.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_chat/build.xml	(.../build.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -407,7 +407,7 @@
 		</generateDeployProperties>
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	<target name="run-deploy-package" description="Run the deploy tool.">
 
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
@@ -423,6 +423,10 @@
 		</java>
 
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
Index: lams_tool_forum/build.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_forum/build.xml	(.../build.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -380,9 +380,7 @@
 		
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" 
-		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+	<target name="run-deploy-package" description="Run the deploy tool.">
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
 				<include name="lib/*.jar"/>
@@ -400,6 +398,10 @@
 		</java>
 					
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r83dc7d56946863fbae89e4aafe2c6db8e0ec2d24 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 83dc7d56946863fbae89e4aafe2c6db8e0ec2d24)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -384,9 +384,7 @@
 			</generateDeployProperties>
 		</target>
 	
-		<target name="deploy-tool" depends="create-deploy-package" 
-			description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+		<target name="run-deploy-package" description="Run the deploy tool.">
 			<path id="deploy.classpath">
 				<fileset dir="${build.deploy}">
 					<include name="lib/*.jar"/>
@@ -405,6 +403,10 @@
 						
 		</target>
 	
+		<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+		</target>
+	
 			<target name="test-report" depends="compile.test"> 
 				<mkdir dir="${build.report}"/>
 				<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -rd87989f6fea882f4b349d8cd4fc3697584272f6c -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision d87989f6fea882f4b349d8cd4fc3697584272f6c)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -394,8 +394,7 @@
 		</target>
 		
 
-		<target name="deploy-tool" depends="delete-exploded-tool-folder,create-deploy-package" 
-			description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+		<target name="run-deploy-package" description="Run the deploy tool.">
 
 			<path id="deploy.classpath">
 				<fileset dir="${build.deploy}">
@@ -414,6 +413,10 @@
 			</java>
 						
 		</target>
+		
+		<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+		</target>
 	
 			<target name="test-report" depends="compile.test"> 
 				<mkdir dir="${build.report}"/>
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -390,9 +390,7 @@
 
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" 
-		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+	<target name="run-deploy-package" description="Run the deploy tool.">
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
 				<include name="lib/*.jar"/>
@@ -410,6 +408,10 @@
 		</java>
 					
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
Index: lams_tool_nb/build.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_nb/build.xml	(.../build.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -460,9 +460,7 @@
 				</generateDeployProperties>
 			</target>
 		
-			<target name="deploy-tool" depends="create-deploy-package" 
-				description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+	<target name="run-deploy-package" description="Run the deploy tool.">
 				<path id="deploy.classpath">
 					<fileset dir="${build.deploy}">
 						<include name="lib/*.jar"/>
@@ -479,8 +477,12 @@
 						<arg value="True"/> 
 				</java>
 							
-			</target>
+	</target>
 	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
+	
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 			<!-- delete old war folder tree -->
 			<delete quiet="true" includeemptydirs="true">
Index: lams_tool_notebook/build.xml
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_notebook/build.xml	(.../build.xml)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_notebook/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -407,7 +407,7 @@
 		</generateDeployProperties>
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	<target name="run-deploy-package" description="Run the deploy tool.">
 
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
@@ -423,6 +423,10 @@
 		</java>
 
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r6ab1be78f747daf9e82788ceee85ccce03d0ab9d -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 6ab1be78f747daf9e82788ceee85ccce03d0ab9d)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -408,9 +408,7 @@
 		
 	</target>
 
-	<target name="deploy-tool" depends="delete-exploded-tool-folder,create-deploy-package" 
-		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+	<target name="run-deploy-package" description="Run the deploy tool.">
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
 				<include name="lib/*.jar"/>
@@ -428,6 +426,11 @@
 		</java>
 					
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
+	
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
 		<delete quiet="true" includeemptydirs="true">
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -r99c1c9152a59db9ee1aa823864f00b0419e0e62d -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision 99c1c9152a59db9ee1aa823864f00b0419e0e62d)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -407,8 +407,9 @@
 		</generateDeployProperties>
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	<target name="run-deploy-package" description="Run the deploy tool.">
 
+
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
 				<include name="lib/*.jar" />
@@ -431,6 +432,10 @@
 		</sql>
 
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
Index: lams_tool_survey/build.xml
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_survey/build.xml	(.../build.xml)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -381,8 +381,7 @@
 
 	</target>
 
-	<target name="deploy-tool" depends="create-deploy-package" 
-		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	<target name="run-deploy-package" description="Run the deploy tool.">
 
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
@@ -401,6 +400,10 @@
 		</java>
 					
 	</target>
+	
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
 
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
Index: lams_tool_vote/build.xml
===================================================================
diff -u -r83dc7d56946863fbae89e4aafe2c6db8e0ec2d24 -r4fb255fea868033aaa6d97d33efb7b2d7def5ff2
--- lams_tool_vote/build.xml	(.../build.xml)	(revision 83dc7d56946863fbae89e4aafe2c6db8e0ec2d24)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision 4fb255fea868033aaa6d97d33efb7b2d7def5ff2)
@@ -413,9 +413,7 @@
 			</generateDeployProperties>
 		</target>
 	
-		<target name="deploy-tool" depends="create-deploy-package" 
-			description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-
+		<target name="run-deploy-package" description="Run the deploy tool.">
 			<path id="deploy.classpath">
 				<fileset dir="${build.deploy}">
 					<include name="lib/*.jar"/>
@@ -434,6 +432,10 @@
 						
 		</target>
 	
+		<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
+	   		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+		</target>
+	
 			<target name="test-report" depends="compile.test"> 
 				<mkdir dir="${build.report}"/>
 				<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>