Index: lams_tool_example/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_example/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_example/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -1,4 +1,4 @@
-f<?xml version="1.0"?>
+<?xml version="1.0"?>
 
 <!-- 
 The DOCTYPE declaration declares the location of database-specific parts of the
@@ -331,6 +331,13 @@
 						<include name="*.properties"/>
 					</fileset>
 				</copy>
+			
+			<copy overwrite="true" todir="${build.deploy}">
+					<fileset dir="${build.lib}">
+						<include name="*.jar"/>
+						<include name="*.war"/>
+					</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 					classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -344,7 +351,7 @@
 					dbUsername="${db.username}"
 					dbDriverUrl="${db.url}"
 					dbDriverClass="com.mysql.jdbc.Driver"
-					deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+					deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 					toolJarFileName="${product}.jar"
 					toolSignature="${signature}"
 					toolVersion="${tool.version}"
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -352,6 +352,13 @@
 				<include name="*.txt"/>
 			</fileset>
 		</copy>		
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -365,7 +372,7 @@
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url}"
 			dbDriverClass="com.mysql.jdbc.Driver"
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolVersion="${tool.version}"
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -356,6 +356,13 @@
 					<include name="*.properties"/>
 				</fileset>
 			</copy>
+			
+			<copy overwrite="true" todir="${build.deploy}">
+					<fileset dir="${build.lib}">
+						<include name="*.jar"/>
+						<include name="*.war"/>
+					</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -369,7 +376,7 @@
 				dbUsername="${db.username}"
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
 				toolVersion="${tool.version}"
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -349,6 +349,13 @@
 					<include name="*.properties"/>
 				</fileset>
 			</copy>
+			
+			<copy overwrite="true" todir="${build.deploy}">
+					<fileset dir="${build.lib}">
+						<include name="*.jar"/>
+						<include name="*.war"/>
+					</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -362,7 +369,7 @@
 				dbUsername="${db.username}"
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
 				toolVersion="${tool.version}"
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -353,6 +353,13 @@
 				<include name="*.jar"/>
 			</fileset>
 		</copy>
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -372,7 +379,7 @@
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url}"
 			dbDriverClass="com.mysql.jdbc.Driver"
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolVersion="${tool.version}"
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -432,6 +432,13 @@
 						<include name="*.properties"/>
 					</fileset>
 				</copy>
+			
+			<copy overwrite="true" todir="${build.deploy}">
+					<fileset dir="${build.lib}">
+						<include name="*.jar"/>
+						<include name="*.war"/>
+					</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 					classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -445,7 +452,7 @@
 					dbUsername="${db.username}"
 					dbDriverUrl="${db.url}"
 					dbDriverClass="com.mysql.jdbc.Driver"
-					deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+					deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 					toolJarFileName="${product}.jar"
 					toolSignature="${signature}"
 					toolVersion="${tool.version}"
Index: lams_tool_notebook/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_notebook/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_notebook/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -380,6 +380,13 @@
 				<include name="*.txt" />
 			</fileset>
 		</copy>
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
 			<classpath refid="deploy.lib.classpath" />
@@ -392,7 +399,7 @@
 			dbUsername="${db.username}" 
 			dbDriverUrl="${db.url}" 
 			dbDriverClass="com.mysql.jdbc.Driver" 
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" 
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" 
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}" 
 			toolVersion="${tool.version}"
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -379,6 +379,13 @@
 				<include name="*.properties"/>
 			</fileset>
 		</copy>
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -392,7 +399,7 @@
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url}"
 			dbDriverClass="${db.driver}"
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolVersion="${tool.version}"
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -380,6 +380,13 @@
 				<include name="*.txt" />
 			</fileset>
 		</copy>
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
 			<classpath refid="deploy.lib.classpath" />
@@ -392,7 +399,7 @@
 			dbUsername="${db.username}" 
 			dbDriverUrl="${db.url}" 
 			dbDriverClass="com.mysql.jdbc.Driver" 
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" 
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" 
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}" 
 			toolVersion="${tool.version}"
Index: lams_tool_survey/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_survey/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -344,6 +344,13 @@
 				<include name="*.jar"/>
 			</fileset>
 		</copy>
+		
+		<copy overwrite="true" todir="${build.deploy}">
+				<fileset dir="${build.lib}">
+					<include name="*.jar"/>
+					<include name="*.war"/>
+				</fileset>
+		</copy>
 
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -363,7 +370,7 @@
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url}"
 			dbDriverClass="com.mysql.jdbc.Driver"
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolVersion="${tool.version}"
Index: lams_tool_vote/build.xml
===================================================================
diff -u -r3ea2691d46a8c052eaffe11a355b31f225932ca9 -r7b3e2f4b13be0f1afe1176276929b98a1f22910d
--- lams_tool_vote/build.xml	(.../build.xml)	(revision 3ea2691d46a8c052eaffe11a355b31f225932ca9)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision 7b3e2f4b13be0f1afe1176276929b98a1f22910d)
@@ -384,6 +384,13 @@
 					<include name="*.properties"/>
 				</fileset>
 			</copy>
+			
+			<copy overwrite="true" todir="${build.deploy}">
+					<fileset dir="${build.lib}">
+						<include name="*.jar"/>
+						<include name="*.war"/>
+					</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -397,7 +404,7 @@
 				dbUsername="${db.username}"
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
 				toolVersion="${tool.version}"