Index: lams_admin/build.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/build.xml	(.../build.xml)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/build.xml	(.../build.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -3,20 +3,18 @@
 <!-- -->
 <!DOCTYPE project [
 ]>
-
-
 <project name="lams_admin" default="usage" basedir=".">
 
-	<property file="build.properties" />
+	<property file="build.properties"/>
+	<property file="../lams_build/common.properties"/>
 
 	<path id="all-libs">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${common.lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<pathelement location="${common.build.dir}" />
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar"/>
+			</fileset>
+			<fileset dir="${j2eelibs}">
+					<include name="**/*.jar"/>
+			</fileset>
 	</path>
 
 	<path id="project.classpath">
@@ -67,7 +65,7 @@
 
 	<target name="compile.java" depends="clean"
 		description="compile java sources">
-		<javac srcdir="${src.dir.java}" compiler="modern"
+		<javac srcdir="${src.java.dir}" compiler="modern"
 			destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
 				<path refid="project.classpath" />
@@ -77,43 +75,26 @@
 
 	<target name="compile.test" depends="compile.java">
 		<javac destdir="${build.classes.test}" compiler="modern">
-			<src path="${test.dir.java}" />
+			<src path="${src.test.dir}" />
 			<classpath>
 				<pathelement location="${build.classes.java}" />
 				<path refid="project.classpath" />
 			</classpath>
 		</javac>
 	</target>
-	
-	
-	<target name="prepareconfdir-windows">
-		<delete quiet="true">
-			<fileset dir="${lamsconf.windows.dir}"/>
-		</delete>
-		<mkdir dir="${lamsconf.windows.dir}"/>
-	</target>
-	
-	<target name="copyconf-windows" depends="prepareconfdir-windows" description="copy lib and config files">
-		<copy overwrite="yes" todir="${jboss.home.windows.dir}/server/default/conf/">
-			<fileset dir="${conf.jboss.windows.dir}/">
-				<include name="login-config.xml"/>
+	<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
+		<copy overwrite="yes" todir="${build.web}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.xml"/>
+				<include name="**/*.tld"/>
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${lamsconf.windows.dir}">
-			<fileset dir="${conf.auth.windows.dir}/">
-				<include name="*.xml"/>
-				<include name="*.dtd"/>
-			</fileset>
-			<fileset dir="${conf.lams.windows.dir}/">
-				<include name="*.xml"/>
-				<include name="*.dtd"/>
-			</fileset>
-		</copy>
-		<copy overwrite="yes" todir="${jboss.deploy.windows.dir}">
-			<fileset dir="${conf.jboss.windows.dir}/service">
-				<include name="mysql*.xml"/>
-			</fileset>
-		</copy>
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams">
+				<fileset dir="${src.java.dir}/org/lamsfoundation/lams">
+						<include name="**/*.xml"/>
+						<include name="**/*.properties"/>
+				</fileset>
+		</copy>	
 	</target>
 
 	<!-- =================================================================== -->
@@ -135,46 +116,70 @@
 		</fail>
 	</target>
 
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+		<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
+			<delete file="${build.lib}/${product}.jar"/>
+			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+				<fileset dir="${build.classes.java}"/>
+				<fileset dir="${conf.hibernate.mapping.dir}"/>
+				<fileset dir="${build.web}"/>
+			</jar>
+		</target>
+	
+	   <!-- =================================================================== -->
+	   <!-- Run xdoclet			                                                -->
+	   <!-- =================================================================== -->
+	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		    <classpath refid="all-libs"/>
+		</taskdef>
+		
+		<target name="webdoclet" depends="preparedirs">
+			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
 
-	<!-- =================================================================== -->
-	<!-- Run webdoclet                                                       -->
-	<!-- =================================================================== -->
-
-
-	<!-- the webdoclet target is commented out as the web.xml and
-	struts-config.xml are not auto-generated -->
-	<!--taskdef name="webdoclet"
-		classname="xdoclet.modules.web.WebDocletTask">
-		<classpath refid="all-libs" />
-	</taskdef>
-
-	<target name="webdoclet" depends="preparedirs">
-		<webdoclet destdir="${generated.java}"
-			force="${xdoclet.force}">
-
-			<fileset dir="${src.dir.java}">
+	         <fileset dir="${src.java.dir}">
 	            <include name="**/*Action.java" />
 	            <include name="**/*Form.java" />
-			</fileset>
-			<fileset dir="${test.dir.java}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-			</fileset>
+	         </fileset>
 
-			<deploymentdescriptor servletspec="2.3"
-				destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}"
-				sessiontimeout="${sessiontimeout}" />
-
-			<strutsconfigxml destdir="${conf.struts.dir}"
-				mergedir="${conf.xdoclet.dir}" version="1.2" />
-		</webdoclet>
-	</target-->
-
-
+	         <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
+				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
+				
+	         <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
+	         <strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
+	      </webdoclet>
+	   </target>
+	
+	   <!-- ================================================ -->
+	   <!-- Make the WAR archive for deployment				 -->
+	   <!-- ================================================ -->	
+		
+	   <target name="build-war" depends="webdoclet,build-jar" description="creates war file">
+	   		<delete file="${build.lib}/${product}.war"/>	
+	   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
+	   			 webxml="${conf.webinf.dir}/web.xml">
+	   			
+	   			<webinf dir="${conf.webinf.dir}">
+	   				<include name=".xml"/>
+	   				<include name="**/*.*"/>
+	   				<exclude name="web.xml"/>
+	   				<exclude name="classes/**"/>
+	   			</webinf>
+	   			<classes dir="${build.classes.java}"/>	
+	   			<!-- front end programs like HTML, JSP, CSS etc. -->
+	   			<fileset dir="${conf.web.dir}">
+						<include name="**/*.jsp"/>
+						<include name="includes/**"/>
+				</fileset>
+	   			
+	   	   </war>
+	   	
+	   </target>
 	<!-- =================================================================== -->
 	<!-- Run JUnit Tests                                                     -->
 	<!-- =================================================================== -->
-	<!-- target name="test" depends="compile.test,build-db">
+	<target name="test" depends="compile.test">
 		<mkdir dir="${build.report}" />
 		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 			fork="yes">
@@ -206,6 +211,6 @@
 			</fileset>
 			<report todir="${build.report}/html" />
 		</junitreport>
-	</target-->
+	</target>
 
 </project>