--- build.xml.sav	2008-07-07 13:25:36.000000000 -0400
+++ build.xml	2008-07-07 13:36:31.000000000 -0400
@@ -138,7 +138,7 @@
         <mkdir dir="${build.testresources.dir}"/>
         <mkdir dir="${build.temp.dir}/${headerdirectory}"/>
         <copy todir="${build.temp.dir}/${headerdirectory}">
-            <fileset dir="${classes.dir}" >
+            <fileset dir="${testclasses.dir}" >
                 <include name="**/test/pack/${packagename}/**.*"/>
             </fileset>
         </copy>
@@ -162,7 +162,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}">
@@ -240,7 +240,7 @@
                 classpath="${java.class.path}"/>
         <javac
                 srcdir="${test.dir}"
-                destdir="${classes.dir}"
+                destdir="${testclasses.dir}"
                 debug="${javac.debug}"
                 optimize="${javac.optimize}"
                 nowarn="on"
@@ -248,12 +248,13 @@
                 target="${javac.target}">
             <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}">
@@ -277,7 +278,9 @@
                 </fileset>
                 <path refid="lib.class.path"/>
                 <!-- pathelement path="${classes.dir}"/ -->
-                <dirset dir="${classes.dir}">
+<!--                <dirset dir="${classes.dir}"> -->
+                <pathelement path="${classes.dir}"/>
+                <dirset dir="${testclasses.dir}">
                     <exclude name="**/pack/**.*"/>
                 </dirset>
 
@@ -289,8 +292,8 @@
             </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>
@@ -300,7 +303,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}">
@@ -317,7 +320,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>