[cvs] expresso commit by mtraum: put test src compilation back into 'compile'

[JCorporate Ltd]

Log Message:
-----------
put test src compilation back into 'compile' target, but make it compile to WEB-INF/test-src

Modified Files:
--------------
    expresso:
        build.xml

Revision Data
-------------
Index: build.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -Lbuild.xml -Lbuild.xml -u -r1.85 -r1.86
--- build.xml
+++ build.xml
@@ -50,6 +50,7 @@
 	<property name="expresso.lib" value="${expresso.lib.base}/WEB-INF/lib"/>
 	<property name="expresso.doc" value="${basedir}/expresso/doc"/>
 	<property name="expresso.build.classes" value="${expresso.build.webinf}/classes"/>
+	<property name="expresso.build.test-classes" value="${expresso.build.webinf}/test-classes"/>
 	<property name="expresso.build.bin" value="${expresso.build.webinf}/bin"/>
 	<property name="expresso.build.lib" value="${expresso.build.webinf}/lib"/>
 	<property name="expresso.build.tld" value="${expresso.build.webinf}/tld"/>
@@ -122,7 +123,6 @@
 ant clean          : Remove all generated class and jar files, plus
                       all generated documentation.
 ant compile        : Compiles only the Expresso base source without a clean
-ant compile-tests  : Compiles the Expresso test source without a clean
 ant build          : Compiles Expresso and generates all
                       documentation after executing a clean
 
@@ -264,6 +264,7 @@
 		-->
 		<mkdir dir="${expresso.build.webinf}"/>
 		<mkdir dir="${expresso.build.classes}"/>
+		<mkdir dir="${expresso.build.test-classes}"/>
 		<mkdir dir="${expresso.build.bin}"/>
 		<!--
 		<mkdir dir="${expresso.build.lib}"/>
@@ -291,22 +292,14 @@
 
             <src path="${expresso.src}"/>
         </javac>
-	</target>
-	
-	<!-- ==========================================================================
-	Target: compile
-	Reads in test source files and converts them into class files suitable for
-	execution by the JVM. 
-============================================================================-->
-	<target name="compile-tests" depends="init, buildDirs, copyResources, checklibs" description="Compile Expresso test source">
 		<javac
-            destdir="${expresso.build.classes}"
-            classpath="${buildclasspath}"
+            destdir="${expresso.build.test-classes}"
+            classpath="${buildclasspath}:${expresso.build.classes}"
             debug="true"
             deprecation="false"
             optimize="true">
 
-            <src path="${testsrcdir}" />
+            <src path="${testsrcdir}"/>
         </javac>
 	</target>
 	
@@ -381,6 +374,7 @@
 	-->
 	<target name="clean" description="Clean up all compiled classes and documentation">
 		<delete dir="${expresso.build.classes}" failonerror="false" />
+		<delete dir="${expresso.build.test-classes}" failonerror="false" />
 		<!-- delete any previously built jar files -->
 		<delete failonerror="false">
 			<fileset dir="${expresso.build.lib}">