Index: lams_tool_lamc/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v
diff -u -r1.33 -r1.33.4.1
--- lams_tool_lamc/build.xml	26 Oct 2006 01:00:38 -0000	1.33
+++ lams_tool_lamc/build.xml	12 Mar 2007 05:09:47 -0000	1.33.4.1
@@ -114,22 +114,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.report}"/>
 			<mkdir dir="${build.lib}"/>
+			<mkdir dir="${build.deploy}"/>
 		</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"
@@ -200,7 +193,7 @@
 		    <classpath refid="all-libs"/>
 		</taskdef>
 		
-		<target name="webdoclet" depends="preparedirs">
+		<target name="webdoclet" depends="clean">
 			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
 
 	         <fileset dir="${src.java.dir}">
@@ -327,9 +320,23 @@
 					<include name="create_lams_tool_mc.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}">
@@ -348,6 +355,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">
@@ -361,14 +375,18 @@
 				dbUsername="${db.username}"
 				dbDriverUrl="${db.url}"
 				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 				toolJarFileName="${product}.jar"
 				toolSignature="${signature}"
-				toolTablesScriptPath="${db.scripts}/create_lams_tool_mc.sql"
-				toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_mc.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_mc.sql" 
+				toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_mc.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/mc/mcApplicationContext.xml"
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
@@ -384,9 +402,7 @@
 			</generateDeployProperties>
 		</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.">
-
+		<target name="run-deploy-package" description="Run the deploy tool.">
 			<path id="deploy.classpath">
 				<fileset dir="${build.deploy}">
 					<include name="lib/*.jar"/>
@@ -405,6 +421,10 @@
 						
 		</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"/>