Index: lams_tool_deploy/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/build.xml,v
diff -u -r1.11 -r1.12
--- lams_tool_deploy/build.xml	6 Mar 2012 11:16:28 -0000	1.11
+++ lams_tool_deploy/build.xml	30 Jul 2012 18:50:22 -0000	1.12
@@ -1,115 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="lams_tool_deploy" default="usage" basedir=".">
+<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="classes.dir" value="build/classes"/>
-        <property name="test.classes.dir" value="build/test"/>
-        <property name="build.dir" value="build/lib"/>
-    	<property name="build.report.dir" value="build/report"/>
-        <property name="lib.dir" value="lib"/>
-		<property name="sharedlib" value="../lams_build/lib"/>
-        <property name="src.dir" value="src/java"/>
-        <property name="test.src.dir" value="test/java"/>
-        <property name="jar.file" value="${build.dir}/lams-tool-deploy.jar"/>
-		<property name="deploy.tool.dir" value="../lams_build/deploy-tool/lib"/>
-        <property name="test.dir" value="test"/>
-        <property name="test.file.dir" value="test/file"/>
-        <property name="debug" value="on"/>
-        
-        <path id="src.class.path">
-            <fileset dir="${lib.dir}">
-                <include name="**/*.jar"/>
-            </fileset>
-    		<fileset dir="${sharedlib}">
-    			<include name="**/*.jar" />
-    		</fileset>
-    		<fileset dir="${deploy.tool.dir}">
-    			<include name="commons-*.jar" />
-    		</fileset>
-        </path>
-        
-        <path id="test.class.path">
-            <pathelement location="${classes.dir}"/> 
-            <path refid="src.class.path"/>
-        </path>
-        
-        <path id="junit.class.path">
-            <pathelement location="${test.classes.dir}"/> 
-            <path refid="test.class.path"/>
-            <fileset dir="${test.file.dir}">
-                <include name="**/*"/>
-            </fileset>
-        </path>
+	<property name="build.classes.java" value="build/classes" />
+	<property name="build.classes.test" value="build/test" />
+	<property name="build.lib" value="build/lib" />
+	<property name="jar.file" value="${build.lib}/lams-tool-deploy.jar" />
+	<property name="build.report" value="build/report" />
 
-        <target name="usage">
-	</target> 
-        
-        <target name="init">
-            <mkdir dir="${classes.dir}"/>
-            <mkdir dir="${test.classes.dir}"/>
-            <mkdir dir="${build.dir}"/>
-        </target>   
-        
-        <target name="clean" depends="init">
-            <delete includeEmptyDirs="true" >
-                <fileset dir="${classes.dir}">
-                    <include name="**/*"/>
-                </fileset>
-                <fileset dir="${build.dir}">
-                    <include name="**/*"/>
-                </fileset>
-                <fileset dir="${test.classes.dir}">
-                    <include name="**/*"/>
-                </fileset>
-            </delete>
-        </target>
-        
-        <target name="compile" depends="clean">
-            <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="src.class.path" debug="${debug}"/>
-            <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" classpathref="test.class.path" debug="${debug}"/>
-    		<copy overwrite="yes" todir="${classes.dir}">
-    			<fileset dir="${src.dir}">
-    				<include name="**/*.properties"/>
-    			</fileset>
-    		</copy>
-        </target>
-        
-        <target name="build" depends="compile">
-            <jar destfile="${jar.file}" basedir="${classes.dir}"/>
-        </target>
+	<property name="src.java.dir" value="src/java" />
+	<property name="src.test.dir" value="test/java" />
+
+	<property name="test.file.dir" value="test/file" />
+	<property name="debug" value="on" />
+
 	
-		<target name="copy-jar" depends="build" description="Builds and copies the jar to lams_build/deploy/lib">
-			<copy todir="${deploy.tool.dir}" file="${jar.file}"/>	
-		</target>
-        
-        
-        <target name="junit" depends="compile" description="Build and test the project">
-        <!-- NOTE: needs fork and dir so it can find test files! -->
-    		<mkdir dir="${build.report.dir}" />
-            <junit printsummary="withOutAndErr" haltonerror="no" haltonfailure="no" showoutput="on" fork="on" dir="${basedir}">
-                <classpath>
-                    <path refid="junit.class.path"/>
-                </classpath>
-        		<formatter type="plain" usefile="false" />
-        		<formatter type="xml" />
-        		<batchtest todir="${build.report.dir}">
-        			<fileset dir="${test.src.dir}">
-                        <include name="**/*Test.java"/>
-        				<!-- base class for test cases -->
-                        <exclude name="**/ToolDBTest.java"/> 
-        				<exclude name="**/ToolDBTest.java"/>
-        			</fileset>
-        		</batchtest>
-            </junit>
-        </target>
+	<path id="libs.classpath">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar"/>
+        </fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${deploy.tool.dir}">
+			<include name="commons-*.jar" />
+		</fileset>
+	</path>
+
+	<path id="product.classes.classpath">
+		<pathelement location="${build.classes.java}" />
+		<path refid="libs.classpath" />
+	</path>
+
 	
-		<target name="test-report" depends="junit" description="Run the tests">
-			<mkdir dir="${build.report.dir}/html" />
-			<junitreport>
-				<fileset dir="${build.report.dir}">
-					<include name="TEST-*.xml" />
+	<target name="_clean-dirs">
+		<!-- Internal target: Recreates dirs for compiled output files. -->
+		<echo>${ant.project.name}: Removing cache and build folders</echo>
+		<delete dir="build" quiet="true" />
+		
+		<echo>${ant.project.name}: Creating build dir structure</echo>
+		<mkdir dir="${build.classes.java}" />
+		<mkdir dir="${build.classes.test}" />
+		<mkdir dir="${build.lib}" />
+		<mkdir dir="${build.report}"/>
+		<mkdir dir="${build.report}/html"/> 
+	</target>
+
+	
+	<target name="_compile-java" depends="_clean-dirs">
+		<!-- Internal target: Compile Java sources. -->
+		<echo>${ant.project.name}: Compiling Java sources</echo>
+		<!-- Destdir is the same as Eclipse output path, maybe it shouldn't? -->
+		<javac srcdir="${src.java.dir}"
+			   compiler="modern"
+               source="1.5"
+               debug="${debug}"
+			   debuglevel="lines,vars,source"
+               classpathref="libs.classpath"
+               destdir="${build.classes.java}"
+		/>
+		
+		<echo>${ant.project.name}: Copying additional non-Java sources</echo>
+	 	<copy todir="${build.classes.java}" overwrite="true">
+			<fileset dir="${src.java.dir}">
+				<include name="**/*.properties"/>
+			</fileset>
+		</copy>
+	</target>
+	
+	
+	<target name="_compile-test" depends="_compile-java">
+		<!-- Internal target: Compile test Java sources. -->
+		<javac srcdir="${src.test.dir}"
+			   compiler="modern"
+			   source="1.5"
+	           debug="${debug}"
+			   debuglevel="lines,vars,source"
+			   destdir="${build.classes.test}"
+			   classpathref="product.classes.classpath" />
+	</target>
+	
+	
+	<target name="_build-jar" depends="_compile-java">
+		<!-- Internal target: Creates JAR file. -->
+		<echo>${ant.project.name}: Building JAR</echo>
+		<jar jarfile="${jar.file}">
+			<fileset dir="${build.classes.java}" />
+		</jar>
+	</target>
+
+
+	<target name="deploy" depends="_build-jar" description="Builds and copies JAR to lams_build/deploy-tool/lib">
+		<copy todir="${deploy.tool.dir}" file="${jar.file}" />
+	</target>
+	
+	
+	<target name="test-report" depends="_compile-test" description="Runs JUnit tests and generates report.">
+		<junit printsummary="withOutAndErr"
+			   haltonerror="no"
+		       haltonfailure="no"
+			   showoutput="on"
+		       errorProperty="test.failed"
+			   failureProperty="test.failed"
+			   fork="yes">
+			<!--
+			<jvmarg value="-Xms512M" />
+			<jvmarg value="-Xmx1024M" />
+			-->
+			<formatter type="plain" usefile="false" />
+			<formatter type="xml" />
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.test.dir}">
+					<include name="**/*Test.java" />
+					<!-- base class for test cases -->
+					<exclude name="**/ToolDBTest.java" />
+					<exclude name="**/ToolDBTest.java" />
 				</fileset>
-				<report todir="${build.report.dir}/html" />
-			</junitreport>
-		</target>
-</project>
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.test}" />
+				<path refid="product.classes.classpath" />
+				<fileset dir="${test.file.dir}" />
+			</classpath>
+		</junit>
+		
+		<junitreport todir="${build.report}">
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report todir="${build.report}/html" />
+		</junitreport>
+	</target>
+</project>
\ No newline at end of file