Index: lams_gradebook/build.xml
===================================================================
diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -r824584ee2b82bea619fbe38b470de7cca15868ea
--- lams_gradebook/build.xml	(.../build.xml)	(revision e074865bde063cd3ac9e531a90857d07de9d121c)
+++ lams_gradebook/build.xml	(.../build.xml)	(revision 824584ee2b82bea619fbe38b470de7cca15868ea)
@@ -5,17 +5,17 @@
 ]>
 <project name="LAMS_Gradebook" default="usage" basedir=".">
 
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
+	<property file="build.properties" />
+	<property file="../lams_build/common.properties" />
 	<property file="../lams_build/${osPropertiesName}.properties" />
 
 	<path id="all-libs">
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${j2eelibs}">
-					<include name="**/*.jar"/>
-			</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${j2eelibs}">
+			<include name="**/*.jar" />
+		</fileset>
 	</path>
 
 	<path id="project.classpath">
@@ -28,8 +28,7 @@
 	<target name="usage">
 		<echo message="" />
 		<echo message="${name} build file" />
-		<echo
-			message="------------------------------------------------------" />
+		<echo message="------------------------------------------------------" />
 		<echo message="" />
 		<echo message="Among the available targets are:" />
 		<echo message="" />
@@ -40,8 +39,7 @@
 	</target>
 
 	<target name="init">
-		<available property="xdoclet-jars-installed"
-			file="lib/xdoclet/xdoclet-${xdoclet.version}.jar" />
+		<available property="xdoclet-jars-installed" file="lib/xdoclet/xdoclet-${xdoclet.version}.jar" />
 	</target>
 
 
@@ -55,19 +53,16 @@
 		<mkdir dir="${build.lib}" />
 	</target>
 
-	<target name="clean" depends="preparedirs"
-		description="removes all class files">
+	<target name="clean" depends="preparedirs" description="removes all class files">
 		<delete>
 			<fileset dir="${build.classes.java}" />
 			<fileset dir="${build.classes.test}" />
 			<fileset dir="${build.lib}" />
 		</delete>
 	</target>
 
-	<target name="compile.java" depends="clean"
-		description="compile java sources">
-		<javac srcdir="${src.java.dir}" compiler="modern"
-			destdir="${build.classes.java}" deprecation="on" debug="on">
+	<target name="compile.java" depends="clean" description="compile java sources">
+		<javac srcdir="${src.java.dir}" compiler="modern" destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
 				<path refid="project.classpath" />
 			</classpath>
@@ -86,23 +81,22 @@
 	<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"/>
+				<include name="**/*.xml" />
+				<include name="**/*.tld" />
 			</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>	
+			<fileset dir="${src.java.dir}/org/lamsfoundation/lams">
+				<include name="**/*.xml" />
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
 	</target>
 
 	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
 	<!-- =================================================================== -->
-	<target name="fail-if-no-xdoclet-1.2"
-		unless="xdoclet-jars-installed">
+	<target name="fail-if-no-xdoclet-1.2" unless="xdoclet-jars-installed">
 		<fail>
 			You must download several jar files before you can build
 			Middlegen. Execute the "download-deps" target. Then try to
@@ -120,154 +114,114 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-		<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
-			<delete file="${build.lib}/${product}.jar"/>
-			<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/gradebook">
-				<fileset dir="${conf.language.dir}">
-					<include name="**/*.properties"/>
-				</fileset>
-			</copy>
-			<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>
-			<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/gradebook">
-				<fileset dir="${conf.language.dir}">
-					<include name="**/*.properties"/>
-					<include name="**/*.txt"/>
-				</fileset>
-			</copy>
-		</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}">
+	<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
+		<delete file="${build.lib}/${product}.jar" />
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
+		<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>
+		<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+		</copy>
+	</target>
 
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
+	<!-- =================================================================== -->
+	<!-- Run xdoclet			                                                -->
+	<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		<classpath refid="all-libs" />
+	</taskdef>
 
-	         <deploymentdescriptor servletspec="2.4" distributable="false"
-	         	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="file/*.xls"/>
-	   					<include name="file/*.sql"/>
-				</fileset>
-	   			
-	   	   </war>
-	   	
-	   </target>
-	
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
-			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
-				<fileset dir="${tag.web.dir}/tags">
-					<include name="*.tag" />
-				</fileset>
-			</copy>
-	   </target>
-	
+	<target name="webdoclet" depends="preparedirs">
+		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+
+			<fileset dir="${src.java.dir}">
+				<include name="**/*Action.java" />
+				<include name="**/*Form.java" />
+			</fileset>
+
+			<deploymentdescriptor servletspec="2.4" distributable="false" 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" 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="file/*.xls" />
+				<include name="file/*.sql" />
+			</fileset>
+
+		</war>
+
+	</target>
+
+	<target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />
+		<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+			<fileset dir="${tag.web.dir}/tags">
+				<include name="*.tag" />
+			</fileset>
+		</copy>
+	</target>
+
 	<!-- =================================================================== -->
 	<!-- Deploy the jar and war                               -->
 	<!-- =================================================================== -->
-	<target name="deploy-war" depends="build-war" description="Deploy the Gradebook war file and jar file">
+	<target name="deploy-war" depends="build-war" description="Deploy the Gradebook war file">
 		<delete quiet="true">
-			<fileset dir="${jboss.deploy}/tmp"/>
-			<fileset dir="${jboss.deploy}/work"/>
+			<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>
-	
+
 	<!-- =================================================================== -->
 	<!-- Deploy the jar                         -->
 	<!-- =================================================================== -->
 	<target name="deploy-jar" depends="build-jar" description="Deploy the Gradebook war file and jar file">
 		<delete quiet="true">
-			<fileset dir="${jboss.deploy}/tmp"/>
-			<fileset dir="${jboss.deploy}/work"/>
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
 		</delete>
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/> 
-	</target>
-	
-	
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}" />
 
-	<!-- =================================================================== -->
-	<!-- Run JUnit Tests                                                     -->
-	<!-- =================================================================== -->
-	<target name="test" depends="compile.test">
-		<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" />
-					<exclude name="**/TestInitSurveySession.java" />
-					<exclude name="**/*Action.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" />
+		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
 			</fileset>
-			<report todir="${build.report}/html" />
-		</junitreport>
+		</copy>
 	</target>
 
 
 	<!-- =========================================== -->
-	<!-- Create/Delete Exploded WAR, Synchronise JSP -->            
+	<!-- Create/Delete Exploded WAR, Synchronise JSP -->
 	<!-- =========================================== -->
 	<target name="delete-exploded-war" description="delete exploded war folder">
 		<!-- delete old war folder tree -->
@@ -295,7 +249,6 @@
 		<delete>
 			<fileset dir="${jboss.deploy}">
 				<include name="temp-${product}.war" />
-				<!--<include name="${product}.jar"/>-->
 			</fileset>
 		</delete>
 	</target>