Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -4,37 +4,42 @@
 <project name="lams_tool_laqa11" basedir="." default="usage">
 
 	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
+	<property file="build.properties" />
+	<property file="../lams_build/common.properties" />
 	<property file="../lams_build/${osPropertiesName}.properties" />
-		
+
 	<path id="all-libs">
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${j2eelibs}">
-					<include name="**/*.jar"/>
-			</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${j2eelibs}">
+			<include name="**/*.jar" />
+		</fileset>
 	</path>
-		
+
+	<path id="schemaexport.classpath">
+		<path refid="project.classpath" />
+		<pathelement location="${build.classes.java}" />
+	</path>
+
 	<path id="project.classpath">
-		<path refid="all-libs"/>
+		<path refid="all-libs" />
 		<!-- Java CLASSPATH should be added as the last item -->
 		<!-- This property is supposed to be set in eclipse  -->
-		<pathelement location="${java.class.path}"/>
+		<pathelement location="${java.class.path}" />
 	</path>
-	
+
 	<target name="usage">
-			<echo message=""/>
-			<echo message="${project} build file"/>
-			<echo message="------------------------------------------------------"/>
-			<echo message=""/>
-			<echo message="Among the available targets are:"/>
-			<echo message=""/>
+		<echo message="" />
+		<echo message="${project} build file" />
+		<echo message="------------------------------------------------------" />
+		<echo message="" />
+		<echo message="Among the available targets are:" />
+		<echo message="" />
 	</target>
-	
+
 	<target name="init">
-			<available property="xdoclet-jars-installed" file="${sharedlib}/xdoclet/xdoclet-${xdoclet.version}.jar"/>
+		<available property="xdoclet-jars-installed" file="${sharedlib}/xdoclet/xdoclet-${xdoclet.version}.jar" />
 	</target>
 	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
@@ -51,102 +56,89 @@
 		      
 	      It's also possible to download the jars manually.
 	     </fail>
-		</target>
+	</target>
 
-		<target name="check-driver-present">
-			<available file="${db.driver.jar}" type="file" property="driver.present"/>
-		</target>
-		<target name="panic-if-driver-not-present" unless="driver.present">
-			<fail>
+	<target name="check-driver-present">
+		<available file="${db.driver.jar}" type="file" property="driver.present" />
+	</target>
+	<target name="panic-if-driver-not-present" unless="driver.present">
+		<fail>
 		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
 		      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
 		      Please make sure you're using a version that is equal or superior to the one we looked for.
 		      If you name the driver jar file differently, please update the db.driver.jar property
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
-	   </target>
+	</target>
 	<!-- =================================================================== -->
 	<!-- Run Middlegen For LearningDesign                                                       -->
 	<!-- =================================================================== -->
-		<target name="middlegen" description="Run Middlegen For QA 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_laqa11" 
-					   prefsdir="${conf.middlegen.dir}"
-					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
-					   driver="${db.driver}"
-					   username="${db.username}"
-					   password="${db.password}"
-					   includeViews="false"
-			>
+	<target name="middlegen" description="Run Middlegen For QA 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" />
 
-				<hibernate destination="${conf.hibernate.mapping.dir}"
-						   package="${laqa11.package}" 
-						   genXDocletTags="true"
-						   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-				/>
-				
-				<table name="tl_lasbmt11_content"/>
-				<table name="tl_lasbmt11_report"/>
-				<table name="tl_lasbmt11_session"/>
-				<table name="tl_lasbmt11_submission_details"/>
-			</middlegen>
+		<middlegen appname="lams_tool_laqa11" prefsdir="${conf.middlegen.dir}" gui="${middlegen.gui}" databaseurl="${db.url}" driver="${db.driver}" username="${db.username}" password="${db.password}" includeViews="false">
 
-		</target>
+			<hibernate destination="${conf.hibernate.mapping.dir}" package="${laqa11.package}" genXDocletTags="true" javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper" />
 
-	
-		<!-- ================================================================ -->
-		<!-- Preparations									                  -->
-		<!-- ================================================================ -->
-		
-		<target name="clean" description="removes all class files">
-			<delete dir="${build}"/>
-			<mkdir dir="${build}"/>
-			<mkdir dir="${build.classes.java}"/>
-			<mkdir dir="${build.classes.test}"/>
-			<mkdir dir="${build.report}"/>
-			<mkdir dir="${build.lib}"/>
-			<mkdir dir="${build.deploy}"/>
-		</target>
+			<table name="tl_lasbmt11_content" />
+			<table name="tl_lasbmt11_report" />
+			<table name="tl_lasbmt11_session" />
+			<table name="tl_lasbmt11_submission_details" />
+		</middlegen>
 
-		<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/qa/">
-								<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/qa/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-										<!-- Autopatch -->
-										<include name="dbupdates/*.sql"/>
-										<include name="dbupdates/autopatchContext.xml"/>
-								</fileset>
-				</copy>						
-		</target>
+	</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>
+
+	<!-- ================================================================ -->
+	<!-- Preparations									                  -->
+	<!-- ================================================================ -->
+
+	<target name="clean" description="removes all class files">
+		<delete dir="${build}" />
+		<mkdir dir="${build}" />
+		<mkdir dir="${build.classes.java}" />
+		<mkdir dir="${build.classes.test}" />
+		<mkdir dir="${build.report}" />
+		<mkdir dir="${build.lib}" />
+		<mkdir dir="${build.deploy}" />
+	</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/qa/">
+			<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/qa/">
+				<include name="*.xml" />
+				<include name="*.properties" />
+				<exclude name="web.xml" />
+				<!-- Autopatch -->
+				<include name="dbupdates/*.sql" />
+				<include name="dbupdates/autopatchContext.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}">
@@ -159,74 +151,73 @@
 					</fileset>
 				</copy>
 		-->
-		</target>
-	
-		<!-- ================================================================ -->
-		<!-- Make jar archive for deployment        		    	          -->
-		<!-- ================================================================ -->
-		<target name="lams-laqa11-jar" depends="compile,compile.test,copyContext" 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="clean">
-			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+	</target>
 
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+	<target name="lams-laqa11-jar" depends="compile,compile.test,copyContext" 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>
 
-	         <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>
-	
-	   <!-- ================================================ -->
-	   <!-- Make the WAR archive for deployment				 -->
-	   <!-- ================================================ -->	
-		
-	   <target name="lams-laqa11-war" depends="lams-laqa11-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>
+	<!-- =================================================================== -->
+	<!-- Run xdoclet			                                                -->
+	<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		<classpath refid="all-libs" />
+	</taskdef>
 
-	   			<!-- <classes dir="${build.classes.java}"/>	 -->
-	   			
-	   			<fileset dir="${conf.web.dir}">
-						<include name="*"/>
-						<include name="authoring/*"/>
-		   				<include name="css/**"/>	   				
-		   				<include name="export/*"/>
-	  					<include name="images/**"/>
-						<include name="common/*"/>
-						<include name="layout/*"/>
-						<include name="includes/*"/>	   				
-						<include name="learning/*"/>
-		   				<include name="monitoring/*"/>
-				</fileset>
-				<!--
+	<target name="webdoclet" depends="clean">
+		<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}" />
+
+			<!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
+		</webdoclet>
+	</target>
+
+	<!-- ================================================ -->
+	<!-- Make the WAR archive for deployment				 -->
+	<!-- ================================================ -->
+
+	<target name="lams-laqa11-war" depends="lams-laqa11-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>
+
+			<!-- <classes dir="${build.classes.java}"/>	 -->
+
+			<fileset dir="${conf.web.dir}">
+				<include name="*" />
+				<include name="authoring/*" />
+				<include name="css/**" />
+				<include name="export/*" />
+				<include name="images/**" />
+				<include name="common/*" />
+				<include name="layout/*" />
+				<include name="includes/*" />
+				<include name="learning/*" />
+				<include name="monitoring/*" />
+				<include name="admin/*" />
+			</fileset>
+			<!--
 	   			<fileset dir="${conf.includes.dir}">
 						<include name="*"/>
 				</fileset>
@@ -235,285 +226,244 @@
 				</fileset>
 				-->
 
-	   	   </war>
-	   	
-	   </target>
-	
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
-			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
-				<fileset dir="${tag.web.dir}/tags">
-					<include name="*.tag" />
-				</fileset>
-			</copy>
-	   </target>
+		</war>
 
-		<!-- =================================================================== -->
-		<!-- Deploy the jar and war                               -->
-		<!-- =================================================================== -->
-			<target name="deploy-war" depends="lams-laqa11-war" description="Deploy the SubmitFiles 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>
-	
-		<!-- =================================================================== -->
-		<!-- Clean and rebuild the database. 									 -->
-		<!-- =================================================================== -->
-		<target name="rebuild-db"
-			description="rebuild QA tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_qa.sql"/>
-				<transaction src="${db.scripts}/create_lams_tool_qa.sql"/>
-				<transaction src="${db.scripts}/insert_tool_qa_data.sql"/>
-			</sql>
-		</target>
+	</target>
 
-		<!-- =================================================================== -->
-		<!-- Clean tool database. 									 -->
-		<!-- =================================================================== -->
-		<target name="clean-tool-db"
-			description="rebuild qa tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_qa.sql"/>
-			</sql>
-		</target>
+	<target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />
+		<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+			<fileset dir="${tag.web.dir}/tags">
+				<include name="*.tag" />
+			</fileset>
+		</copy>
+	</target>
 
-	
-		<!-- =================================================================== -->
-		<!-- Generate the deploy package                                         -->
-		<!-- =================================================================== -->
-		<target name="create-deploy-package" depends="lams-laqa11-war" 
-			description="Generate the deployment package.">
+	<!-- =================================================================== -->
+	<!-- Deploy the jar and war                               -->
+	<!-- =================================================================== -->
+	<target name="deploy-war" depends="lams-laqa11-war" description="Deploy the SubmitFiles 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>
 
-			<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"/> 
-			<mkdir dir="${build.deploy}/language"/>
-			 
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="drop_lams_tool_qa.sql"/>
-					<include name="create_lams_tool_qa.sql"/>
-					<include name="activity_insert.sql"/>
-					<include name="library_insert.sql"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="tool_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="db_version_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-					<filter token="signature" value="${signature}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql/updatescripts" failonerror="false">
-				<fileset dir="${db.scripts}/updatescripts/">
-					<include name="*.sql" />
-				</fileset>
-			</copy>
+	<!-- =================================================================== -->
+	<!-- Clean and rebuild the database. 									 -->
+	<!-- =================================================================== -->
+	<target name="rebuild-db" description="rebuild QA tables">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+			<classpath>
+				<pathelement location="${db.driver.jar}" />
+			</classpath>
+			<transaction src="${db.scripts}/drop_lams_tool_qa.sql" />
+			<transaction src="${db.scripts}/create_lams_tool_qa.sql" />
+			<transaction src="${db.scripts}/insert_tool_qa_data.sql" />
+		</sql>
+	</target>
 
-			<copy overwrite="yes" todir="${build.deploy}/">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
+	<!-- =================================================================== -->
+	<!-- Clean tool database. 									 -->
+	<!-- =================================================================== -->
+	<target name="clean-tool-db" description="rebuild qa tables">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+			<classpath>
+				<pathelement location="${db.driver.jar}" />
+			</classpath>
+			<transaction src="${db.scripts}/drop_lams_tool_qa.sql" />
+		</sql>
+	</target>
 
-			<copy overwrite="yes" todir="${build.deploy}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/language">
-				<fileset dir="${conf.language.dir}">
-					<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">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
+	<!-- =================================================================== -->
+	<!-- Generate the deploy package                                         -->
+	<!-- =================================================================== -->
+	<target name="create-deploy-package" depends="lams-laqa11-war" description="Generate the deployment package.">
 
-			<generateDeployProperties depends="compile" 
-				mode="development" 
-				outputPath="${build.deploy}"
-				generateForInstallers="${generate.for.installers}"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
-				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
-				toolJarFileName="${product}.jar"
-				toolSignature="${signature}"
-				toolVersion="${tool.version}"
-				hideTool="${hideTool}"
-				minServerVersionNumber="${min.server.version.number}"
-				toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql"
-				toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" 
-				toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" 
-				toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" 
-				toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" 
-				toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" 
-				toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql"
-				toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml"
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
 
-				lamsEarPath="${jboss.deploy}"
-				toolContext="${toolContext}"
-				toolWebUri="${product}.war"
-				languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+		<mkdir dir="${build.deploy}" />
+		<mkdir dir="${build.deploy}/lib" />
+		<mkdir dir="${build.deploy}/sql" />
+		<mkdir dir="${build.deploy}/language" />
 
-				<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
-				<fileset dir="${build.deploy}/language">
-					<include name="**/*.properties"/>
-					<include name="**/*.txt"/>
-				</fileset>
-					
-			</generateDeployProperties>
-		</target>
-	
-		<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
-			<!-- delete old war folder tree -->
-			<delete quiet="true" includeemptydirs="true">
-				<fileset dir="${jboss.deploy}/${product}.war">
-				    <include name="**"/>
-				</fileset>
-			</delete>
-			<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
-			<delete quiet="true" includeemptydirs="true">
-				<fileset dir="${jboss.deploy}/temp-${product}.war">
-				    <include name="**"/>
-				</fileset>
-			</delete>
-		</target>
-		
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="drop_lams_tool_qa.sql" />
+				<include name="create_lams_tool_qa.sql" />
+				<include name="activity_insert.sql" />
+				<include name="library_insert.sql" />
+			</fileset>
+		</copy>
 
-		<target name="run-deploy-package" description="Run the deploy tool.">
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="tool_insert.sql" />
+			</fileset>
+			<filterset>
+				<filter token="tool_version" value="${tool.version}" />
+			</filterset>
+		</copy>
 
-			<path id="deploy.classpath">
-				<fileset dir="${build.deploy}">
-					<include name="lib/*.jar"/>
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="db_version_insert.sql" />
+			</fileset>
+			<filterset>
+				<filter token="tool_version" value="${tool.version}" />
+				<filter token="signature" value="${signature}" />
+			</filterset>
+		</copy>
+
+		<copy overwrite="yes" todir="${build.deploy}/sql/updatescripts" failonerror="false">
+			<fileset dir="${db.scripts}/updatescripts/">
+				<include name="*.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>
+
+		<copy overwrite="yes" todir="${build.deploy}/language">
+			<fileset dir="${conf.language.dir}">
+				<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">
+			<classpath refid="deploy.lib.classpath" />
+		</taskdef>
+
+		<generateDeployProperties depends="compile" mode="development" outputPath="${build.deploy}" generateForInstallers="${generate.for.installers}" dbPassword="${db.password}" dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" toolVersion="${tool.version}" hideTool="${hideTool}" minServerVersionNumber="${min.server.version.number}" toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+
+			<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+			<fileset dir="${build.deploy}/language">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+
+		</generateDeployProperties>
+	</target>
+
+	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
+		<!-- delete old war folder tree -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/${product}.war">
+				<include name="**" />
+			</fileset>
+		</delete>
+		<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/temp-${product}.war">
+				<include name="**" />
+			</fileset>
+		</delete>
+	</target>
+
+
+	<target name="run-deploy-package" description="Run the deploy tool.">
+
+		<path id="deploy.classpath">
+			<fileset dir="${build.deploy}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
+
+		<echo>Deploying the QA tool</echo>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.Deploy" classpathref="deploy.classpath" fork="true">
+			<arg file="${build.deploy}/deploy.xml" />
+			<arg value="True" />
+		</java>
+
+	</target>
+
+	<target name="deploy-tool" depends="create-deploy-package, run-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.">
+	</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/qa/">
+			<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/qa/">
+				<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="**/TestQaContent.java" />
+
 				</fileset>
-			</path> 
+			</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>
 
-			<echo>Deploying the QA tool</echo>
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.Deploy"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${build.deploy}/deploy.xml"/>
-					<arg value="True"/> 
-			</java>
-						
-		</target>
-		
-		<target name="deploy-tool" depends="create-deploy-package, run-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.">
-		</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/qa/">
-								<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/qa/">
-										<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="**/TestQaContent.java"/>
+		<junitreport todir="${build.report}">
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report todir="${build.report}/html" />
+		</junitreport>
 
-						</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>
-				
-				<junitreport todir="${build.report}"> 
-					<fileset dir="${build.report}">
-						<include name="TEST-*.xml"/>
-					</fileset>
-					<report todir="${build.report}/html"/> 
-				</junitreport>
+	</target>
 
-			</target>
-	
-	   <!-- =================================  -->
-	   <!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
-	   <!-- ================================= -->
-	    <target name="native2ascii" 
-	    	description="convert UTF-8 language files to Java properties files using native2ascii">
-			<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
-			   includes="*.txt" ext=".properties"/>
-	    </target>
+	<!-- =================================  -->
+	<!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
+	<!-- ================================= -->
+	<target name="native2ascii" description="convert UTF-8 language files to Java properties files using native2ascii">
+		<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}" includes="*.txt" ext=".properties" />
+	</target>
 
-	   <!-- ================================= 
+	<!-- ================================= 
 	          target: synchronize-jsp              
 	         ================================= -->
-	    <target name="synchronize-deploy" description="copy non-java file into deploy folder">
-	        <copy verbose="yes" todir="${jboss.deploy}/${product}.war">
-	        	<fileset dir="${conf.web.dir}">
-	        		<include name="**/*.*"/>
-	        	</fileset>
-	        </copy>
-	    </target>
-	
-	<target name="explode-tool" depends="deploy-tool" description="explode tool jar and war package to a war folder">
+	<target name="synchronize-deploy" description="copy non-java file into deploy folder">
+		<copy verbose="yes" todir="${jboss.deploy}/${product}.war">
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" description="explode tool jar and war package to a war folder">
 		<!-- rename war file to avoid name conflict -->
 		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war" />
 		<!-- explode the ear -->
@@ -529,4 +479,52 @@
 		</delete>
 	</target>
 
+	<!-- =================================================================== -->
+	<!-- Generate hibernate xml files                             			 -->
+	<!-- =================================================================== -->
+	<target name="generate-wizard-hbm-files" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
+
+		<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="all-libs" />
+
+		<echo message="Building hbm.xml files using XDoclet" />
+
+		<hibernatedoclet destdir="${conf.hibernate.mapping.dir}" excludedtags="@version,@author,@todo" force="true">
+			<fileset dir="${src.java.dir}">
+				<include name="**/QaWizard*.java" />
+				<include name="**/QaConfigItem.java" />
+			</fileset>
+			<hibernate version="3.0" />
+		</hibernatedoclet>
+	</target>
+
+	<!-- exports all the hbm mappings to the specified database -->
+	<target name="wizard-schemaexport" description="Exports all hbm.xml files in {conf.hibernate.mapping.dir}/hbm" depends="clean, generate-wizard-hbm-files">
+		<echo message="Run the schema export for all hbm.xml files in ${conf.hibernate.mapping.dir}/hbm" />
+		<taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" classpathref="schemaexport.classpath">
+		</taskdef>
+		<schemaexport properties="${conf.hibernate.mapping.dir}/hibernate.properties" quiet="no" text="no" drop="no" delimiter=";" output="${db.scripts}/table-schema.sql">
+			<fileset dir="${conf.hibernate.mapping.dir}">
+				<include name="**/QaWizard*.hbm.xml" />
+				<include name="**/QaConfigItem.hbm.xml" />
+			</fileset>
+		</schemaexport>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Deploy the gmap jar                          -->
+	<!-- =================================================================== -->
+	<target name="deploy-jar" depends="lams-laqa11-jar" description="Deploy the tool 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 overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/qa">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+		</copy>
+	</target>
+
 </project>
\ No newline at end of file