Index: lams_contentrepository/build.xml
===================================================================
diff -u -r0a2c5ee66a400c541950f989059eec858b321ac5 -r9521d8efcb3e577a474aed2d2bb69b2231d19801
--- lams_contentrepository/build.xml	(.../build.xml)	(revision 0a2c5ee66a400c541950f989059eec858b321ac5)
+++ lams_contentrepository/build.xml	(.../build.xml)	(revision 9521d8efcb3e577a474aed2d2bb69b2231d19801)
@@ -35,12 +35,12 @@
 		<echo message=""/>
 		<echo message="deploy-lamscr  --> Deploy the content repository project"/>
 		<echo message="create-db-tables   --> (Re)create the content repository tables"/>
-<!--		<echo message="insert-test-data --> <!-- Insert test data to database"/>  -->
+		<echo message="insert-test-data --> Insert test data to database"/>
 		<echo message="lamscr-jar  --> Make jar archive for deployment"/>
 		<echo message="lamscr-war  --> Make war archive for deployment"/>
-<!--		<echo message="copyfiles --> <!--Copy the third party jar files and cofiguration files for deployment"/> -->
-<!--		<echo message="middlegen-cr --> <!-- Run middlegen for content repository tables"/> -->
-		<echo message="hbm2java-cr--> Run hbm2java for content repository mapping files"/>
+		<echo message="copyfiles --> Copy the third party jar files and cofiguration files for deployment"/> 
+<!--		<echo message="middlegen-cr --> <!-- Run middlegen for content repository tables"/>  -->
+<!--		<echo message="hbm2java-cr --> <!-- Run hbm2java for content repository mapping files"/> -->
 		<echo message=""/>
 	</target>
 
@@ -174,6 +174,13 @@
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
+		<!-- Spring files -->
+		<copy overwrite="yes" todir="${build.classes}/com/lamsinternational/lams/contentrepository/">
+			<fileset dir="${src.java}/com/lamsinternational/lams/contentrepository">
+					<include name="*.xml"/>
+					<include name="*.properties"/>
+			</fileset>
+		</copy>
 	</target>
 
 	<!-- ================================================================ -->
@@ -184,8 +191,8 @@
 		<jar jarfile="${build.lib}/${product}.jar">
 			<fileset dir="${build.classes}">
 			</fileset>
-<!--			<fileset dir="${hbm}">
-			</fileset> -->
+			<fileset dir="${hbm}">
+			</fileset>
 		</jar>
 	</target>
 
@@ -203,9 +210,10 @@
 				<include name="jstl/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar"/>
-			</lib>
+			<!-- don't include the jar file as it should be built and deployed separately -->
+			<!-- <lib dir="${build.lib}"> -->
+			<!-- 	<include name="${product}.jar"/> -->
+			<!-- </lib> -->
 			<fileset dir="${web}">
 				<include name="*"/>
 				<include name="admin/*"/>
@@ -217,7 +225,7 @@
 	<!-- =================================================================== -->
 	<!-- Copy the third party jar files and cofiguration files for deployment-->
 	<!-- =================================================================== -->
-<!--	<target name="copyfiles" description="copy lib and config files">
+	<target name="copyfiles" description="copy lib and config files">
 		<copy overwrite="yes" todir="${jboss.home}/server/default/lib/">
 			<fileset dir="${lib}/cglib/">
 				<include name="*.jar"/>
@@ -256,31 +264,30 @@
 				<include name="*.jar"/>
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${jboss.home}/server/default/conf/">
-			<fileset dir="${conf.jboss}/">
-				<include name="login-config.xml"/>
-			</fileset>
-		</copy>
-		<copy overwrite="yes" todir="${jboss.deploy}">
-			<fileset dir="${conf.jboss}/service">
-				<include name="mysql*.xml"/>
-			</fileset>
-		</copy>
+<!--		<copy overwrite="yes" todir="${jboss.home}/server/default/conf/"> -->
+<!--			<fileset dir="${conf.jboss}/"> -->
+<!--				<include name="login-config.xml"/> -->
+<!--			</fileset> -->
+<!--		</copy> -->
+<!--		<copy overwrite="yes" todir="${jboss.deploy}"> -->
+<!--			<fileset dir="${conf.jboss}/service"> -->
+<!--				<include name="mysql*.xml"/> -->
+<!--			</fileset> -->
+<!--		</copy> -->
 	</target>
--->
+
 	<!-- =================================================================== -->
 	<!-- Deploy the project                                                  -->
 	<!-- =================================================================== -->
-<!--	<target name="deploy-lamscr" depends="lamscr-jar,lamscr-war" description="removes all class files">-->
-	<target name="deploy-lamscr" depends="lamscr-jar" description="deploy project to jboss">
+	<target name="deploy-lamscr" depends="lamscr-jar,lamscr-war" description="removes all class files">
 		<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}"/> -->
+		<copy file="${build.lib}/${product}.war"
+				todir="${jboss.deploy}"/> 
 	</target>
 
 	<!-- =================================================================== -->