Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r735c5db341aaba22874662bf7e44ec91a24424c7
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 735c5db341aaba22874662bf7e44ec91a24424c7)
@@ -41,6 +41,7 @@
 		<!-- This property is supposed to be set in eclipse  -->
 		<pathelement location="${java.class.path}"/>
 	</path>
+
 	
 	<target name="usage">
 			<echo message=""/>
@@ -83,381 +84,417 @@
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
 	   </target>
-	<!-- =================================================================== -->
-	<!-- Run Middlegen For mc                                                       -->
-	<!-- =================================================================== -->
-		<target name="middlegen" description="Run Middlegen For mc Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
-			<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
-			
-			<middlegen appname="lams_tool_lamc11" 
-					   prefsdir="${conf.middlegen.dir}"
-					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
-					   driver="${db.driver}"
-					   username="${db.username}"
-					   password="${db.password}"
-					   includeViews="false"
-			>
-
-				<hibernate destination="${conf.hibernate.mapping.dir}"
-						   package="${package}" 
-						   genXDocletTags="true"
-						   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-				/>
-				
-				<table name="tl_lamc11_content"/>
-				<table name="tl_lamc11_session"/>
-				<table name="tl_lamc11_que_usr"/>
-				<table name="tl_lamc11_que_content"/>
-				<table name="tl_lamc11_options_content"/>
-				<table name="tl_lamc11_usr_attempt"/>				
-			</middlegen>
-
-		</target>
-
-		<!-- =================================================================== -->
-		<!-- Run hbm2java for learningdesign                                                       -->
-		<!-- =================================================================== -->
-		<target name="hbm2java" description="Generate .java from .hbm files.">
-			<taskdef  name="hbm2java"
-	         classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
-	         classpathref="all-libs"
-	      />
-		
-		  <hbm2java output="${src.java.dir}">
-				<fileset dir="${conf.hibernate.mapping.dir}/${path}">
-					<include name="*.hbm.xml"/>
-				</fileset>
-			</hbm2java>
-		</target>
 	
-		<!-- ================================================================ -->
-		<!-- Preparations									                  -->
-		<!-- ================================================================ -->
-		
-		<target name="preparedirs">
-			<mkdir dir="${build}"/>
-			<mkdir dir="${build.classes.java}"/>
-			<mkdir dir="${build.classes.test}"/>
+		<target name="AAAtest-report" depends="compile.test"> 
 			<mkdir dir="${build.report}"/>
-			<mkdir dir="${build.lib}"/>
-		</target>
-	
-		<target name="clean" depends="preparedirs" description="removes all class files">
-			<delete>
-				<fileset dir="${build.classes.java}"/>
-				<fileset dir="${build.classes.test}"/>
-			</delete>
-			<mkdir dir="${build.classes.java}"/>
-			<mkdir dir="${build.classes.test}"/>
-		</target>
+			<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
+			<copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
+			<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
+			<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/mc/">
+							<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/mc/">
+									<include name="*.xml"/>
+									<include name="*.properties"/>
+				   				    <exclude name="web.xml"/>
+							</fileset>
+			</copy>						
+			<junit printsummary="yes" haltonerror="no" haltonfailure="no"
+				   fork="yes">
+				<formatter type="plain" usefile="false"/>
+				<formatter type="xml"/>
+				<batchtest todir="${build.report}">
+					<fileset dir="${src.test.dir}">
+					  <include name="**/TestMcContent.java"/>  
+					<!-- <include name="**/TestMcQueContent.java"/> -->
+					<!-- <include name="**/TestMcOptionsContent.java"/>  -->
+					<!-- <include name="**/TestMcSession.java"/> -->
+					<!-- <include name="**/TestMcQueUsr.java"/>  -->
 
-		<target name="compile" depends="clean" description="compile java sources">
-			<javac srcdir="${src.java.dir}" compiler="modern"
-		         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
-				<classpath>					
-					<path refid="project.classpath"/>
-				</classpath>
-				</javac>
-				<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/tool/mc/">
-								<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/mc/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-								</fileset>
-				</copy>						
-		</target>
-
-		<target name="compile.test" depends="compile">
-			<javac srcdir="${src.test.dir}" destdir="${build.classes.test}" compiler="modern">
+						
+					</fileset>
+				</batchtest>
 				<classpath>
 					<pathelement location="${build.classes.java}"/>
+					<pathelement location="${build.classes.test}"/>
+					<pathelement location="${hbm}"/>
+					<pathelement location="${web}"/>
+					<pathelement location="${webinf.spring}"/>
+					<pathelement location="${testweb}"/>
 					<path refid="project.classpath"/>
 				</classpath>
-			</javac>
-		</target>
-		
-		<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
-			<copy overwrite="yes" todir="${build.web}">
-				<fileset dir="${conf.web.dir}">
-					<include name="**/*.xml"/>
-					<include name="**/*.tld"/>
-					<include name="**/*.jsp"/>
-					<include name="**/*.properties"/>
+			</junit>
+			
+			<junitreport todir="${build.report}"> 
+				<fileset dir="${build.report}">
+					<include name="TEST-*.xml"/>
 				</fileset>
-				</copy>
-		<!--
-			<copy overwrite="yes" todir="${build.web.includes}">	
-					<fileset dir="${conf.includes.dir}">
-						<include name="**/*.jsp"/>
-					</fileset>
-				</copy>
-				<copy overwrite="yes" todir="${build.web.template}">	
-					<fileset dir="${conf.template.dir}">
-						<include name="**/*.jsp"/>
-					</fileset>
-				</copy>
-		-->
+				<report todir="${build.report}/html"/> 
+			</junitreport>
+
 		</target>
+
+
+<!-- =================================================================== -->
+<!-- Run Middlegen For mc                                                       -->
+<!-- =================================================================== -->
+<target name="middlegen" description="Run Middlegen For mc Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
+	<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
 	
-		<!-- ================================================================ -->
-		<!-- Make jar archive for deployment        		    	          -->
-		<!-- ================================================================ -->
-		<target name="lams-lamc11-jar" depends="compile,compile.test" description="creates jar file">
-			<delete file="${build.lib}/${product}.jar"/>
-			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
-				<fileset dir="${build.classes.java}"/>
-				<fileset dir="${conf.hibernate.mapping.dir}"/>
-				<!-- <fileset dir="${build.web}"/> -->
-				<!--<fileset dir="${build.web.includes}"/>-->
-				<!--<fileset dir="${build.web.template}"/>-->
-			</jar>
-		</target>
-	
-	   <!-- =================================================================== -->
-	   <!-- Run xdoclet			                                                -->
-	   <!-- =================================================================== -->
-	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-		    <classpath refid="all-libs"/>
-		</taskdef>
+	<middlegen appname="lams_tool_lamc11" 
+			   prefsdir="${conf.middlegen.dir}"
+			   gui="${middlegen.gui}"
+			   databaseurl="${db.url}"
+			   driver="${db.driver}"
+			   username="${db.username}"
+			   password="${db.password}"
+			   includeViews="false"
+	>
+
+		<hibernate destination="${conf.hibernate.mapping.dir}"
+				   package="${package}" 
+				   genXDocletTags="true"
+				   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
+		/>
 		
-		<target name="webdoclet" depends="preparedirs">
-			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+		<table name="tl_lamc11_content"/>
+		<table name="tl_lamc11_session"/>
+		<table name="tl_lamc11_que_usr"/>
+		<table name="tl_lamc11_que_content"/>
+		<table name="tl_lamc11_options_content"/>
+		<table name="tl_lamc11_usr_attempt"/>				
+	</middlegen>
 
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
+</target>
 
-	         <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
-				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
-				
-	      <!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
-	      </webdoclet>
-	   </target>
+
+<!-- ================================================================ -->
+<!-- Preparations									                  -->
+<!-- ================================================================ -->
+
+<target name="preparedirs">
+	<mkdir dir="${build}"/>
+	<mkdir dir="${build.classes.java}"/>
+	<mkdir dir="${build.classes.test}"/>
+	<mkdir dir="${build.report}"/>
+	<mkdir dir="${build.lib}"/>
+</target>
+
+<target name="clean" depends="preparedirs" description="removes all class files">
+	<delete>
+		<fileset dir="${build.classes.java}"/>
+		<fileset dir="${build.classes.test}"/>
+	</delete>
+	<mkdir dir="${build.classes.java}"/>
+	<mkdir dir="${build.classes.test}"/>
+</target>
+
+<target name="compile" depends="clean" description="compile java sources">
+	<javac srcdir="${src.java.dir}" compiler="modern"
+         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
+		<classpath>					
+			<path refid="project.classpath"/>
+		</classpath>
+		</javac>
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/tool/mc/">
+						<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/mc/">
+								<include name="*.xml"/>
+								<include name="*.properties"/>
+			   				    <exclude name="web.xml"/>
+						</fileset>
+		</copy>						
+</target>
+
+<target name="compile.test" depends="compile">
+	<javac srcdir="${src.test.dir}" destdir="${build.classes.test}" compiler="modern">
+		<classpath>
+			<pathelement location="${build.classes.java}"/>
+			<path refid="project.classpath"/>
+		</classpath>
+	</javac>
+</target>
+
+<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
+	<copy overwrite="yes" todir="${build.web}">
+		<fileset dir="${conf.web.dir}">
+			<include name="**/*.xml"/>
+			<include name="**/*.tld"/>
+			<include name="**/*.jsp"/>
+			<include name="**/*.properties"/>
+		</fileset>
+		</copy>
+<!--
+	<copy overwrite="yes" todir="${build.web.includes}">	
+			<fileset dir="${conf.includes.dir}">
+				<include name="**/*.jsp"/>
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${build.web.template}">	
+			<fileset dir="${conf.template.dir}">
+				<include name="**/*.jsp"/>
+			</fileset>
+		</copy>
+-->
+</target>
 	
-	   <!-- ================================================ -->
-	   <!-- Make the WAR archive for deployment				 -->
-	   <!-- ================================================ -->	
+	<target name="runTest" description="copies the applicationContext.xml files to the web directory">
+		<mkdir dir="${build.report}"/>
+		<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
+	<!-- <copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>		-->
+	<!--	<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>	-->
+		<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/mc/">
+						<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/mc/">
+								<include name="*.xml"/>
+								<include name="*.properties"/>
+			   				    <exclude name="web.xml"/>
+						</fileset>
+		</copy>						
+		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
+			   fork="yes">
+			<formatter type="plain" usefile="false"/>
+			<formatter type="xml"/>
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.test.dir}">
+				  <include name="**/TestMcQueContent.java"/>  
+				<!-- <include name="**/TestMcQueContent.java"/> -->
+				<!-- <include name="**/TestMcOptionsContent.java"/>  -->
+				<!-- <include name="**/TestMcSession.java"/> -->
+				<!-- <include name="**/TestMcQueUsr.java"/>  -->
+
+					
+				</fileset>
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.java}"/>
+				<pathelement location="${build.classes.test}"/>
+				<pathelement location="${hbm}"/>
+				<pathelement location="${web}"/>
+				<pathelement location="${webinf.spring}"/>
+				<pathelement location="${testweb}"/>
+				<path refid="project.classpath"/>
+			</classpath>
+		</junit>
 		
-	<target name="lams-lamc11-war" depends="lams-lamc11-jar" description="creates war file">
-		   		<delete file="${build.lib}/${product}.war"/>	
-		   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
-		   			 webxml="${conf.webinf.dir}/web.xml">
-		   			
-		   			<webinf dir="${conf.webinf.dir}">
-		   				<include name=".xml"/>
-		   				<include name="**/*.*"/>
-		   				<exclude name="web.xml"/>
-		   			</webinf>
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
 
-		   			<!-- <classes dir="${build.classes.java}"/>	 -->
-		   			
-		   			<fileset dir="${conf.web.dir}">
-							<include name="*"/>
-		   					<include name="author_page/**"/>
-					</fileset>
-					<!--
-		   			<fileset dir="${conf.includes.dir}">
-							<include name="*"/>
-					</fileset>
-		   			<fileset dir="${conf.template.dir}">
-							<include name="*"/>
-					</fileset>
-					-->
+	</target>
 
-		   	   </war>
-		   	
-		   </target>	
-		<!-- =================================================================== -->
-		<!-- Deploy the jar and war                               -->
-		<!-- =================================================================== -->
-			<target name="deploy-war" depends="lams-lamc11-war" description="Deploy the Mc tool war file and jar file">
-			<delete quiet="true">
-				<fileset dir="${jboss.deploy}/tmp"/>
-				<fileset dir="${jboss.deploy}/work"/>
-			</delete>
-			<copy file="${build.lib}/${product}.jar"
-					todir="${jboss.deploy}"/> 
-			<copy file="${build.lib}/${product}.war"
-					todir="${jboss.deploy}"/> 
-		</target>
-	
+<!-- ================================================================ -->
+<!-- Make jar archive for deployment        		    	          -->
+<!-- ================================================================ -->
+<target name="lams-lamc11-jar" depends="compile,compile.test" description="creates jar file">
+	<delete file="${build.lib}/${product}.jar"/>
+	<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+		<fileset dir="${build.classes.java}"/>
+		<fileset dir="${conf.hibernate.mapping.dir}"/>
+		<!-- <fileset dir="${build.web}"/> -->
+		<!--<fileset dir="${build.web.includes}"/>-->
+		<!--<fileset dir="${build.web.template}"/>-->
+	</jar>
+</target>
+
+<!-- =================================================================== -->
+<!-- Run xdoclet			                                                -->
+<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+    <classpath refid="all-libs"/>
+</taskdef>
+
+<target name="webdoclet" depends="preparedirs">
+	<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+
+     <fileset dir="${src.java.dir}">
+        <include name="**/*Action.java" />
+        <include name="**/*Form.java" />
+     </fileset>
+
+     <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
+		mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
 		
-		<!-- =================================================================== -->
-		<!-- Initialize database. 									 -->
-		<!-- =================================================================== -->
-		<target name="init-db"
-			description="rebuild Mc Files tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/init_lams_tool_lamc.sql"/>
-			</sql>
-		</target>
-	
-		<!-- =================================================================== -->
-		<!-- Clean and rebuild the database. 									 -->
-		<!-- =================================================================== -->
-		<target name="rebuild-db"
-			description="rebuild Mc Files tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_lamc.sql"/>
-				<transaction src="${db.scripts}/create_lams_tool_lamc.sql"/>
-				<transaction src="${db.scripts}/insert_lams_tool_lamc.sql"/> 
-			</sql>
-		</target>
+  <!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
+  </webdoclet>
+</target>
 
-		<!-- =================================================================== -->
-		<!-- Clean tool database. 									 -->
-		<!-- =================================================================== -->
-		<target name="clean-tool-db"
-			description="rebuild Mc Files tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_lamc.sql"/>
-			</sql>
-		</target>
+<!-- ================================================ -->
+<!-- Make the WAR archive for deployment				 -->
+<!-- ================================================ -->	
 
-	
-		<!-- =================================================================== -->
-		<!-- Generate the deploy package                                         -->
-		<!-- =================================================================== -->
-		<target name="create-deploy-package" depends="lams-lamc11-war" 
-			description="Generate the deployment package.">
+<target name="lams-lamc11-war" depends="lams-lamc11-jar" description="creates war file">
+   		<delete file="${build.lib}/${product}.war"/>	
+   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
+   			 webxml="${conf.webinf.dir}/web.xml">
+   			
+   			<webinf dir="${conf.webinf.dir}">
+   				<include name=".xml"/>
+   				<include name="**/*.*"/>
+   				<exclude name="web.xml"/>
+   			</webinf>
 
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-				  
-			<mkdir dir="${build.deploy}"/>
-			<mkdir dir="${build.deploy}/lib"/> 
-			<mkdir dir="${build.deploy}/sql"/> 
-			 
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="drop_lams_tool_lamc.sql"/>
-					<include name="create_lams_tool_lamc.sql"/>
-					<include name="activity_insert.sql"/>
-					<include name="library_insert.sql"/>
-					<include name="tool_insert.sql"/>
-				</fileset>
-			</copy>
+   			<!-- <classes dir="${build.classes.java}"/>	 -->
+   			
+   			<fileset dir="${conf.web.dir}">
+					<include name="*"/>
+   					<include name="author_page/**"/>
+			</fileset>
+			<!--
+   			<fileset dir="${conf.includes.dir}">
+					<include name="*"/>
+			</fileset>
+   			<fileset dir="${conf.template.dir}">
+					<include name="*"/>
+			</fileset>
+			-->
 
-			<copy overwrite="yes" todir="${build.deploy}/">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
+   	   </war>
+   	
+   </target>	
+<!-- =================================================================== -->
+<!-- Deploy the jar and war                               -->
+<!-- =================================================================== -->
+	<target name="deploy-war" depends="lams-lamc11-war" description="Deploy the Mc tool war file and jar file">
+	<delete quiet="true">
+		<fileset dir="${jboss.deploy}/tmp"/>
+		<fileset dir="${jboss.deploy}/work"/>
+	</delete>
+	<copy file="${build.lib}/${product}.jar"
+			todir="${jboss.deploy}"/> 
+	<copy file="${build.lib}/${product}.war"
+			todir="${jboss.deploy}"/> 
+</target>
 
-			<copy overwrite="yes" todir="${build.deploy}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
 
-			<taskdef name="generateDeployProperties" 
-				classname="org.lamsfoundation.lams.tool.deploy.CreatePackageTask">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
+<!-- =================================================================== -->
+<!-- Initialize database. 									 -->
+<!-- =================================================================== -->
+<target name="init-db"
+	description="rebuild Mc Files tables">
+	<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+			password="${db.password}">
+		<classpath>
+			<pathelement location="${db.driver.jar}"/>
+		</classpath>
+		<transaction src="${db.scripts}/init_lams_tool_lamc.sql"/>
+	</sql>
+</target>
 
-			<generateDeployProperties depends="compile" 
-				mode="development" 
-				outputPath="${build.deploy}"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
-				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
-				toolSignature="${signature}"
-				toolTablesScriptPath="${db.scripts}/create_lams_tool_lamc.sql"
-				toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_lamc.sql"
-				toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
-				toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
-				toolInsertScriptPath="${db.scripts}/tool_insert.sql"
-				lamsEarPath="${jboss.deploy}"
-				toolContext="${toolContext}"
-				toolWebUri="${product}.war"
-				/>
-		</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.">
+<!-- =================================================================== -->
+<!-- Clean and rebuild the database. 									 -->
+<!-- =================================================================== -->
+<target name="rebuild-db"
+	description="rebuild Mc Files tables">
+	<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+			password="${db.password}">
+		<classpath>
+			<pathelement location="${db.driver.jar}"/>
+		</classpath>
+		<transaction src="${db.scripts}/drop_lams_tool_lamc.sql"/>
+		<transaction src="${db.scripts}/create_lams_tool_lamc.sql"/>
+		<transaction src="${db.scripts}/insert_lams_tool_lamc.sql"/> 
+	</sql>
+</target>
 
-			<path id="deploy.classpath">
-				<fileset dir="${build.deploy}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
+<!-- =================================================================== -->
+<!-- Clean tool database. 									 -->
+<!-- =================================================================== -->
+<target name="clean-tool-db"
+	description="rebuild Mc Files tables">
+	<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+			password="${db.password}">
+		<classpath>
+			<pathelement location="${db.driver.jar}"/>
+		</classpath>
+		<transaction src="${db.scripts}/drop_lams_tool_lamc.sql"/>
+	</sql>
+</target>
 
-			<echo>Deploying the Question and Answer tool</echo>
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.Deploy"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${build.deploy}/deploy.properties"/>
-					<arg value="True"/> 
-			</java>
-						
-		</target>
-	
-			<target name="test-report" depends="compile.test"> 
-				<mkdir dir="${build.report}"/>
-				<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
-				<copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
-				<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
-				<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/mc/">
-								<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/mc/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-								</fileset>
-				</copy>						
-				<junit printsummary="yes" haltonerror="no" haltonfailure="no"
-					   fork="yes">
-					<formatter type="plain" usefile="false"/>
-					<formatter type="xml"/>
-					<batchtest todir="${build.report}">
-						<fileset dir="${src.test.dir}">
-						<!-- <include name="**/TestMcContent.java"/>  -->
-						<!-- <include name="**/TestMcQueContent.java"/> -->
-							 <include name="**/TestMcOptionsContent.java"/>  
-						<!-- <include name="**/TestMcSession.java"/> -->
-						<!-- <include name="**/TestMcQueUsr.java"/>  -->
 
-							
-						</fileset>
-					</batchtest>
-					<classpath>
-						<pathelement location="${build.classes.java}"/>
-						<pathelement location="${build.classes.test}"/>
-						<pathelement location="${hbm}"/>
-						<pathelement location="${web}"/>
-						<pathelement location="${webinf.spring}"/>
-						<pathelement location="${testweb}"/>
-						<path refid="project.classpath"/>
-					</classpath>
-				</junit>
+<!-- =================================================================== -->
+<!-- Generate the deploy package                                         -->
+<!-- =================================================================== -->
+<target name="create-deploy-package" depends="lams-lamc11-war" 
+	description="Generate the deployment package.">
+
+	<path id="deploy.lib.classpath">
+		<fileset dir="${deploy.tool.dir}">
+			<include name="lib/*.jar"/>
+		</fileset>
+	</path> 
+		  
+	<mkdir dir="${build.deploy}"/>
+	<mkdir dir="${build.deploy}/lib"/> 
+	<mkdir dir="${build.deploy}/sql"/> 
+	 
+	<copy overwrite="yes" todir="${build.deploy}/sql">
+		<fileset dir="${db.scripts}/">
+			<include name="drop_lams_tool_lamc.sql"/>
+			<include name="create_lams_tool_lamc.sql"/>
+			<include name="activity_insert.sql"/>
+			<include name="library_insert.sql"/>
+			<include name="tool_insert.sql"/>
+		</fileset>
+	</copy>
+
+	<copy overwrite="yes" todir="${build.deploy}/">
+		<fileset dir="${deploy.tool.dir}">
+			<include name="*.*"/>
+		</fileset>
+	</copy>
+
+	<copy overwrite="yes" todir="${build.deploy}/lib">
+		<fileset dir="${deploy.tool.dir}/lib">
+			<include name="*.jar"/>
+		</fileset>
+	</copy>
+
+	<taskdef name="generateDeployProperties" 
+		classname="org.lamsfoundation.lams.tool.deploy.CreatePackageTask">
+	    <classpath refid="deploy.lib.classpath"/>
+	</taskdef>
+
+	<generateDeployProperties depends="compile" 
+		mode="development" 
+		outputPath="${build.deploy}"
+		dbPassword="${db.password}"
+		dbUsername="${db.username}"
+		dbDriverUrl="${db.url}"
+		dbDriverClass="com.mysql.jdbc.Driver"
+		deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+		toolSignature="${signature}"
+		toolTablesScriptPath="${db.scripts}/create_lams_tool_lamc.sql"
+		toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_lamc.sql"
+		toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
+		toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
+		toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+		lamsEarPath="${jboss.deploy}"
+		toolContext="${toolContext}"
+		toolWebUri="${product}.war"
+		/>
+</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.">
+
+	<path id="deploy.classpath">
+		<fileset dir="${build.deploy}">
+			<include name="lib/*.jar"/>
+		</fileset>
+	</path> 
+
+	<echo>Deploying the Question and Answer tool</echo>
+
+	<java
+		classname="org.lamsfoundation.lams.tool.deploy.Deploy"
+		classpathref="deploy.classpath"
+		fork="true">
+			<arg file="${build.deploy}/deploy.properties"/>
+			<arg value="True"/> 
+	</java>
 				
-				<junitreport todir="${build.report}"> 
-					<fileset dir="${build.report}">
-						<include name="TEST-*.xml"/>
-					</fileset>
-					<report todir="${build.report}/html"/> 
-				</junitreport>
+</target>
+	
 
-			</target>
 	
 </project>
\ No newline at end of file