Index: lams_monitoring/build.properties
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -re5c5837df6794819de332957f68c115476631807
--- lams_monitoring/build.properties	(.../build.properties)	(revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962)
+++ lams_monitoring/build.properties	(.../build.properties)	(revision e5c5837df6794819de332957f68c115476631807)
@@ -1,7 +1,9 @@
 # Ant properties for building the lams survey tool
 
 #name of this project
-name=survey
+name=monitoring
+product=lams_monitoring
+version=1.1
 
 # Library directory within project. Where third party jars reside.
 lib.dir=${basedir}/lib
@@ -27,16 +29,16 @@
 conf.struts.dir=${conf.web.dir}/WEB-INF/struts
 
 #monitoring package definition
-survey.package=org.lamsfoundation.lams.monitoring
-survey.path=org/lamsfoundation/lams/monitoring
+monitoring.package=org.lamsfoundation.lams.monitoring
+monitoring.path=org/lamsfoundation/lams/monitoring
 
 #database access
 db.name=lams1
 db.driver=com.mysql.jdbc.Driver
 db.url=jdbc:mysql://localhost/${db.name}
 db.username=lams
 db.password=lamsdemo
-db.driver.jar=${lib.dir}/mysql/mysql-connector-java-3.0.16-ga-bin.jar
+db.driver.jar=${lib.dir}/mysql/mysql-connector-java-3.1.7-bin.jar
 db.scripts=${basedir}/db/sql
 
 #xdoclet version number
Index: lams_monitoring/build.xml
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -re5c5837df6794819de332957f68c115476631807
--- lams_monitoring/build.xml	(.../build.xml)	(revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962)
+++ lams_monitoring/build.xml	(.../build.xml)	(revision e5c5837df6794819de332957f68c115476631807)
@@ -20,7 +20,7 @@
 	</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}" />
@@ -70,6 +70,11 @@
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
+  		<copy overwrite="yes" todir="${build.classes.java}">
+  			<fileset dir="${src.dir.test}">
+  				<include name="*.hbm.xml"/>
+  			</fileset>
+  		</copy>		
 	</target>
 	
 	<target name="compile.test" depends="compile.java">
@@ -80,13 +85,34 @@
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
-		<copy overwrite="yes" todir="${build.classes.test}/${survey.path}">
-			<fileset dir="${src.dir.test}/${survey.path}">
+		<copy overwrite="yes" todir="${build.classes.test}/${monitoring.path}">
+			<fileset dir="${src.dir.test}/${monitoring.path}">
 				<include name="*.xml"/>
 			</fileset>
 		</copy>
 	</target>
 
+	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
+	<!-- Make the war archive  for deployment             -->
+	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
+	<target name="build-war" depends="compile.java, webdoclet" description="creates war file">
+		<delete file="${build.lib}/${product}.war"/>
+		<war warfile="${build.lib}/${product}.war" 
+  				webxml="${conf.webinf.dir}/web.xml">
+			<webinf dir="${conf.webinf.dir}">
+				<include name="*.xml"/>
+				<include name="struts/*"/>
+				<include name="jstl/*"/>
+				<include name="spring/*"/>
+				<exclude name="web.xml"/>
+			</webinf>
+			<classes dir="${build.classes.java}"/>
+			<lib dir="${conf.webinf.dir}/lib"/>
+			<fileset dir="${conf.web.dir}">
+				<include name="*"/>
+			</fileset>
+		</war>
+	</target>
    <!-- =================================================================== -->
    <!-- Fails if XDoclet 1.2.x is not on classpath                          -->
    <!-- =================================================================== -->
@@ -155,76 +181,6 @@
 				mergedir="${conf.xdoclet.dir}" version="1.2" />	
        </webdoclet>
    </target>
+
 	
-	<!-- =================================================================== -->
-	<!-- Monitoring Database tasks                                               -->
-	<!-- =================================================================== -->
-	<target name="clean-db"	description="clean survey tool database.">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-				password="${db.password}">
-			<classpath>
-				<pathelement location="${db.driver.jar}"/>
-			</classpath>
-			<transaction src="${db.scripts}/cleanup_survey_data.sql"/>
-		</sql>
-	</target>
-	
-	<target name="init-db"	description="drop and create survey tool database.">
-		<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_survey.sql"/>
-			<transaction src="${db.scripts}/create_lams_tool_survey.sql"/>
-		</sql>
-	</target>
-	
-	<target name="build-db"	depends="init-db" 
-							description="build survey tool database.">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-				password="${db.password}">
-			<classpath>
-				<pathelement location="${db.driver.jar}"/>
-			</classpath>
-			<transaction src="${db.scripts}/insert_types_data.sql"/>
-			<transaction src="${db.scripts}/insert_tool_survey_data.sql"/>
-		</sql>
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- Run JUnit Tests                                                     -->
-	<!-- =================================================================== -->
-	<target name="test" depends="compile.test,build-db"> 
-		<mkdir dir="${build.report}"/>
-		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
-			   fork="yes">
-			<formatter type="plain" usefile="false"/>
-			<formatter type="xml"/>
-			<batchtest todir="${build.report}">
-				<fileset dir="${src.dir.test}">
-					<include name="**/Test*.java"/>
-					<exclude name="**/Test*All.java"/>
-				</fileset>
-			</batchtest>
-			<classpath>
-				<pathelement location="${build.classes.java}"/>
-				<pathelement location="${build.classes.test}"/>
-				<pathelement location="${conf.hibernate.mapping.dir}"/>
-				<pathelement location="${conf.web.dir}"/>
-				<path refid="project.classpath"/>
-			</classpath>
-		</junit>
-	</target>
-	
-	<target name="test-report" depends="test">
-		<mkdir dir="${build.report}/html"/> 
-		<junitreport todir="${build.report}"> 
-			<fileset dir="${build.report}">
-				<include name="TEST-*.xml"/>
-			</fileset>
-			<report todir="${build.report}/html"/> 
-		</junitreport>
-	</target>
-	
 </project>