Index: lams_tool_nb/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/build.xml,v
diff -u -r1.29 -r1.29.2.1
--- lams_tool_nb/build.xml	28 Sep 2006 23:31:32 -0000	1.29
+++ lams_tool_nb/build.xml	12 Mar 2007 05:10:45 -0000	1.29.2.1
@@ -79,9 +79,11 @@
 		<delete dir="${build.classes.java}"/>
 		<delete dir="${build.classes.test}"/>
 		<delete dir="${build.lib}"/>
+		<delete dir="${build.deploy}"/>
 		<mkdir dir="${build.classes.java}"/>
 		<mkdir dir="${build.classes.test}"/>
 		<mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.deploy}"/>
 	</target>
 
 	<!-- ================================================================ -->
@@ -403,9 +405,23 @@
 						<include name="create_lams_tool_nb.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}">
@@ -424,6 +440,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">
@@ -437,14 +460,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_nb.sql"
-					toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_nb.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_nb.sql" 
+					toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_nb.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/noticeboard/applicationContext.xml"
 					lamsEarPath="${jboss.deploy}"
 					toolContext="${toolContext}"
@@ -460,9 +487,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"/>
@@ -479,8 +504,12 @@
 						<arg value="True"/> 
 				</java>
 							
-			</target>
+	</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">