Index: lams_common/build.xml
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -rbdf66e21388f7f5bf777b250b788ba9c23c8f8bc
--- lams_common/build.xml	(.../build.xml)	(revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/build.xml	(.../build.xml)	(revision bdf66e21388f7f5bf777b250b788ba9c23c8f8bc)
@@ -184,9 +184,9 @@
 		</javac>
 		<!-- Spring files -->
 		<copy overwrite="yes" todir="${build.classes}/org/lamsfoundation/lams/">
-				<fileset dir="${src.java}/org/lamsfoundation/lams">
-						<include name="*.xml"/>
-						<include name="*.properties"/>
+				<fileset dir="${src.java}/org/lamsfoundation/lams/">
+						<include name="**/*.xml"/>
+						<include name="**/*.properties"/>
 				</fileset>
 		</copy>
 	</target>
@@ -230,7 +230,6 @@
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar">
 			<fileset dir="${build.classes}"/>
-			<fileset dir="${build.test}"/>
 			<fileset dir="${hbm}"/>
 			<fileset dir="${build.web}"/>
 		</jar>
@@ -331,7 +330,7 @@
 			<formatter type="xml"/>
 			<batchtest todir="${build.report}">
 				<fileset dir="${src.test.java}">
-					<include name="**/Test*"/>
+					<include name="**/Test*.java"/>
 					<exclude name="**/Test*All.java"/>
 					<exclude name="**/TestInitLesson.java"/>
 				</fileset>
@@ -341,7 +340,6 @@
 				<pathelement location="${build.test}"/>
 				<pathelement location="${hbm}"/>
 				<pathelement location="${web}"/>
-				<pathelement location="${webinf.spring}"/>
 				<pathelement location="${testweb}"/>
 				<path refid="project.classpath"/>
 			</classpath>