Index: lams_tool_deploy/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/build.xml,v
diff -u -r1.19.2.1 -r1.19.2.2
--- lams_tool_deploy/build.xml	30 Jul 2014 08:40:31 -0000	1.19.2.1
+++ lams_tool_deploy/build.xml	1 Aug 2014 08:50:31 -0000	1.19.2.2
@@ -2,28 +2,14 @@
 
 <project name="LAMS Tool Deploy Utility " basedir="." default="deploy">
 
-	<property name="sharedlib" value="../lams_build/lib" />
-	<property name="deploy.tool.dir" value="../lams_build/deploy-tool/lib" />
-	 <property name="lib.dir" value="lib"/>
-	
-	<property name="build.classes.java" value="build/classes" />
-	<property name="build.lib" value="build/lib" />
-	<property name="jar.file" value="${basedir}/build/lib/lams-tool-deploy.jar" />
-
-	<property name="src.java.dir" value="src/java" />
-
-	<property name="debug" value="on" />
-
-	
 	<path id="libs.classpath">
-        <fileset dir="${lib.dir}">
+        <fileset dir="lib">
             <include name="**/*.jar"/>
         </fileset>
-		<fileset dir="../lams_build/lib">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="../lams_build/deploy-tool">
+		<fileset dir="../lams_build/deploy-tool/lib">
 			<include name="commons-*.jar" />
+			<include name="mysql-connector-java-*.jar" />
+			<include name="xstream-*.jar" />
 		</fileset>
 	</path>
 
@@ -47,11 +33,11 @@
 	<target name="_compile-java" depends="_clean-dirs">
 		<!-- Internal target: Compile Java sources. -->
 		<echo>${ant.project.name}: Compiling Java sources</echo>
-		<javac srcdir="${src.java.dir}"
+		<javac srcdir="src/java"
 			   compiler="modern"
                source="1.8"
 			   target="1.8"
-               debug="${debug}"
+               debug="on"
 			   includeantruntime="false"
 			   debuglevel="lines,vars,source"
                classpathref="libs.classpath"
@@ -62,7 +48,7 @@
 		
 		<echo>${ant.project.name}: Copying additional non-Java sources</echo>
 	 	<copy todir="${basedir}/build/classes/java" overwrite="true">
-			<fileset dir="${src.java.dir}">
+			<fileset dir="src/java">
 				<include name="**/*.properties"/>
 			</fileset>
 		</copy>
@@ -72,13 +58,13 @@
 	<target name="_build-jar" depends="_compile-java">
 		<!-- Internal target: Creates JAR file. -->
 		<echo>${ant.project.name}: Building JAR</echo>
-		<jar jarfile="${jar.file}">
+		<jar jarfile="${basedir}/build/lib/lams-tool-deploy.jar">
 			<fileset dir="${basedir}/build/classes/java" />
 		</jar>
 	</target>
 
 
 	<target name="deploy" depends="_build-jar" description="Builds and copies JAR to lams_build/deploy-tool/lib">
-		<copy todir="../lams_build/deploy-tool" file="${jar.file}" />
+		<copy todir="../lams_build/deploy-tool/lib" file="${basedir}/build/lib/lams-tool-deploy.jar" />
 	</target>
 </project>
\ No newline at end of file