Index: lams_tool_deploy/build.xml
===================================================================
diff -u -r60f8ad90ac03834ede1c4a45585f7f117d5844de -rc3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision 60f8ad90ac03834ede1c4a45585f7f117d5844de)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f)
@@ -26,6 +26,7 @@
         <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="src.dir" value="src/java"/>
         <property name="test.src.dir" value="test/java"/>
@@ -93,20 +94,31 @@
         
         <target name="junit" depends="compile" description="Build and test the project">
         <!-- NOTE: needs fork and dir so it can find test files! -->
-            <junit printsummary="withOutAndErr" haltonfailure="true" showoutput="on" fork="on" dir="${basedir}">
+    		<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"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.FileTokenReplacerTest" todir="${basedir}/test/results" outfile="FileTokenReplacer"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.DeployConfigTest" todir="${basedir}/test/results" outfile="DeployConfig"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.DeployFilesTaskTest" todir="${basedir}/test/results" outfile="DeployFilesTask"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.ScriptRunnerTest" todir="${basedir}/test/results" outfile="ScriptRunner"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.ToolDBDeployTaskTest" todir="${basedir}/test/results" outfile="ToolDBDeployTaskTest"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.ToolDBActivateTaskTest" todir="${basedir}/test/results" outfile="ToolDBActivateTaskTest"/>
-                <test name="org.lamsfoundation.lams.tool.deploy.DeployTest" todir="${basedir}/test/results" outfile="DeployTest"/>
+        		<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>
 	
-
+		<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" />
+				</fileset>
+				<report todir="${build.report.dir}/html" />
+			</junitreport>
+		</target>
 </project>
Index: lams_tool_deploy/test/file/sql/activity_insert.sql
===================================================================
diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rc3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f
--- lams_tool_deploy/test/file/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9)
+++ lams_tool_deploy/test/file/sql/activity_insert.sql	(.../activity_insert.sql)	(revision c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f)
@@ -23,8 +23,6 @@
 , learning_library_id
 , create_date_time
 , run_offline_flag
-, offline_instructions
-, online_instructions
 , max_number_of_options
 , min_number_of_options
 , options_instructions
@@ -63,8 +61,6 @@
 , ${learning_library_id}
 , NOW()
 , 0
-, 'Do it yourself'
-, 'Do it in LAMS'
 , NULL
 , NULL
 , NULL
Index: lams_tool_deploy/test/file/sql/tool_insert.sql
===================================================================
diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rc3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f
--- lams_tool_deploy/test/file/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9)
+++ lams_tool_deploy/test/file/sql/tool_insert.sql	(.../tool_insert.sql)	(revision c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f)
@@ -8,6 +8,8 @@
 service_name,
 tool_display_name,
 description,
+tool_identifier,
+tool_version,
 learning_library_id,
 default_tool_content_id,
 valid_flag,
@@ -31,6 +33,8 @@
 'test.test.deploy.Test',
 'DEPLOY TEST TOOL 1',
 'TEST DATA FOR DEPLOY APP',
+'testapp',
+'1.1',
 NULL,
 NULL,
 0,
Fisheye: Tag c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f refers to a dead (removed) revision in file `lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/CreatePackageTaskTest.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java
===================================================================
diff -u -r60f8ad90ac03834ede1c4a45585f7f117d5844de -rc3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f
--- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java	(.../DeployConfigTest.java)	(revision 60f8ad90ac03834ede1c4a45585f7f117d5844de)
+++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java	(.../DeployConfigTest.java)	(revision c3089a13a1f3bbc264f9eeeb7c1198a5ddc81d5f)
@@ -64,19 +64,19 @@
     
     public void testGetDbUsername()
     {
-        assertEquals(config.getDbUsername(), "root");
+        assertEquals(config.getDbUsername(), "lams");
         assertEquals(config2.getDbUsername(), "root2");
     }
     
     public void testGetDbPassword()
     {
-        assertEquals(config.getDbPassword(), "dag.Quiz");
+        assertEquals(config.getDbPassword(), "lamsdemo");
         assertEquals(config2.getDbPassword(), "dag.Quiz2");
     }
     
     public void testGetDbDriverUrl()
     {
-        assertEquals(config.getDbDriverUrl(), "jdbc:mysql://localhost:3306/scratch");
+        assertEquals(config.getDbDriverUrl(), "jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull");
         assertEquals(config2.getDbDriverUrl(), "jdbc:mysql://localhost:3306/scratch2");
     }