Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.36 -r1.36.2.1
--- lams_tool_sbmt/build.xml	13 Dec 2006 06:28:49 -0000	1.36
+++ lams_tool_sbmt/build.xml	12 Mar 2007 05:14:17 -0000	1.36.2.1
@@ -102,7 +102,7 @@
 	
 		<target name="generate-hbm" 
 				description="Generates Hibernate class descriptor files."
-			depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present,preparedirs">
+			depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
 			    <!-- Define the hibernatedoclet task -->
 			    <taskdef name="hibernatedoclet"
 			        classname="xdoclet.modules.hibernate.HibernateDocletTask"
@@ -156,22 +156,15 @@
 		<!-- Preparations									                  -->
 		<!-- ================================================================ -->
 		
-		<target name="preparedirs">
+		<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.deploy}"/>
 			<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" source="1.5"
@@ -227,7 +220,7 @@
 		    <classpath refid="all-libs"/>
 		</taskdef>
 		
-		<target name="webdoclet" depends="preparedirs">
+		<target name="webdoclet">
 			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
 
 	         <fileset dir="${src.java.dir}">
@@ -350,9 +343,23 @@
 				<include name="create_lams_tool_sbmt.sql"/>
 				<include name="activity_insert.sql"/>
 				<include name="library_insert.sql"/>
-				<include name="tool_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/updatescripts" failonerror="false">
+			<fileset dir="${db.scripts}/updatescripts/">
+				<include name="*.sql" />
+			</fileset>
+		</copy>
 
 		<copy overwrite="yes" todir="${build.deploy}/">
 			<fileset dir="${deploy.tool.dir}">
@@ -371,6 +378,13 @@
 				<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">
@@ -384,14 +398,18 @@
 			dbUsername="${db.username}"
 			dbDriverUrl="${db.url}"
 			dbDriverClass="${db.driver}"
-			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
-			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_sbmt.sql"
-			toolTablesScriptPath="${db.scripts}/create_lams_tool_sbmt.sql"
-			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
-			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
-			toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+			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_sbmt.sql" 
+			toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_sbmt.sql" 
+			toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" 
+			toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" 
+			toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" 
 			toolApplicationContextPath="/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml"
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
@@ -408,9 +426,7 @@
 		
 	</target>
 
-	<target name="deploy-tool" depends="delete-exploded-tool-folder,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.">
-
+	<target name="run-deploy-package" description="Run the deploy tool.">
 		<path id="deploy.classpath">
 			<fileset dir="${build.deploy}">
 				<include name="lib/*.jar"/>
@@ -428,6 +444,11 @@
 		</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="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
 		<!-- delete old war folder tree -->
 		<delete quiet="true" includeemptydirs="true">