--- build.xml.sav	2008-06-24 18:28:35.000000000 -0400
+++ build.xml	2008-07-02 21:49:59.000000000 -0400
@@ -40,6 +40,7 @@
                 classpath="${java.class.path}"/>
         <javac
                 source="1.5"
+                target="1.5"
                 srcdir="${src.dir}"
                 destdir="${classes.dir}"
                 classpathref="lib.class.path"
@@ -57,7 +58,7 @@
         <mkdir dir="${build.testresources.dir}"/>
         <jar destfile="${build.testresources.dir}/${jarname}.${extension}">
             <!-- fileset dir="${build.temp.dir}"/ -->
-            <fileset dir="${classes.dir}">
+            <fileset dir="${testclasses.dir}">
                 <include name="**/test/pack/${packagename}/**.*"/>
             </fileset>
             <fileset dir="${testresources.dir}/${jarname}">
@@ -73,7 +74,7 @@
         <mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/>
         <copy todir="${build.testresources.dir}/${jarname}.${extension}">
             <!-- fileset dir="${build.temp.dir}"/ -->
-            <fileset dir="${classes.dir}">
+            <fileset dir="${testclasses.dir}">
                 <include name="**/test/pack/${jarname}/**.*"/>
             </fileset>
             <fileset dir="${testresources.dir}/${jarname}">
@@ -128,19 +129,21 @@
                 classpath="${java.class.path}"/>
         <javac
                 source="1.5"
+                target="1.5"
                 srcdir="${test.dir}"
-                destdir="${classes.dir}"
+                destdir="${testclasses.dir}"
                 debug="${javac.debug}"
                 optimize="${javac.optimize}"
                 nowarn="on">
             <classpath>
                 <path refid="lib.class.path"/>
+                <pathelement path="${classes.dir}"/>
             </classpath>
         </javac>
     </target>
 
     <target name="junit" depends="compiletest,test-resources">
-        <mkdir dir="test_output"/>
+        <mkdir dir="${test.out.dir}"/>
         <mkdir dir="${classes.dir}/META-INF/services"/>
         <copy todir="${classes.dir}">
             <fileset dir="${resources.dir}">
@@ -163,21 +166,17 @@
                     <include name="**/*.par"/>
                 </fileset>
                 <path refid="lib.class.path"/>
-                <!-- pathelement path="${classes.dir}"/ -->
-                <dirset dir="${classes.dir}">
+                <pathelement path="${classes.dir}"/>
+                <dirset dir="${testclasses.dir}">
                     <exclude name="**/pack/**.*"/>
                 </dirset>
-
-                <!-- pathelement path="build/test.par"/ -->
                 <pathelement path="${src.dir}"/>
-                <!-- pick up properties from here -->
                 <pathelement path="${test.dir}"/>
-                <!-- pick up mappings from here -->
             </classpath>
             <formatter type="plain"/>
             <formatter type="xml"/>
-            <batchtest fork="yes" todir="test_output" haltonfailure="no">
-                <fileset dir="${classes.dir}">
+            <batchtest fork="yes" todir="${test.out.dir}" haltonfailure="no">
+                <fileset dir="${testclasses.dir}">
                     <include name="**/*Test.class"/>
                 </fileset>
             </batchtest>
@@ -187,7 +186,7 @@
     <!-- Run a single unit test. -->
     <target name="junitsingle" depends="compiletest"
             description="Run a single test suite (requires testname and jdbc.driver properties)">
-        <mkdir dir="test_output"/>
+        <mkdir dir="${test.out.dir}"/>
         <junit printsummary="yes" fork="yes" haltonfailure="yes">
             <classpath>
                 <fileset dir="${jdbc.dir}">
@@ -204,7 +203,7 @@
             </classpath>
             <formatter type="plain"/>
             <formatter type="xml"/>
-            <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/>
+            <test fork="yes" todir="${test.out.dir}" haltonfailure="no" name="${testname}"/>
         </junit>
     </target>