--- build.xml.sav	2006-05-13 13:58:24.000000000 -0400
+++ build.xml	2006-08-02 13:45:08.000000000 -0400
@@ -107,7 +107,7 @@
         </antcall>
     </target>
 
-    <target name="compiletest" depends="compile" description="Compile the tests">
+    <!-- target name="compiletest" depends="compile" description="Compile the tests">
         <available
                 classname="org.eclipse.core.launcher.Main"
                 property="build.compiler"
@@ -116,7 +116,7 @@
         <javac
                 source="1.5"
                 srcdir="${test.dir}"
-                destdir="${classes.dir}"
+                destdir="${testclasses.dir}"
                 debug="${javac.debug}"
                 optimize="${javac.optimize}"
                 nowarn="on">
@@ -124,9 +124,18 @@
                 <path refid="lib.class.path"/>
             </classpath>
         </javac>
-    </target>
+    </target -->
+
+    <path id="junit.moduleclasspath">
+           <pathelement location="${src.dir}"/>
+           <pathelement location="${test.dir}"/>
+           <pathelement location="lib/testlibs/org.eclipse.jdt.core_3.1.0.jar"/>           <fileset dir="${jdbc.dir}">
+                       <include name="**/*.jar"/>
+                           <include name="**/*.zip"/>
+           </fileset>
+    </path>
 
-    <target name="junit" depends="compiletest,test-resources">
+    <!-- target name="junit" depends="compiletest,test-resources">
         <mkdir dir="test_output"/>
         <mkdir dir="${classes.dir}/META-INF/services"/>
         <copy todir="${classes.dir}">
@@ -150,16 +159,12 @@
                     <include name="**/*.par"/>
                 </fileset>
                 <path refid="lib.class.path"/>
-                <!-- pathelement path="${classes.dir}"/ -->
                 <dirset dir="${classes.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"/>
@@ -169,7 +174,7 @@
                 </fileset>
             </batchtest>
         </junit>
-    </target>
+    </target -->
 
     <!-- Run a single unit test. -->
     <target name="junitsingle" depends="compiletest"