--- build.xml.sav	2008-11-13 00:10:07.516545000 -0500
+++ build.xml	2008-11-13 00:09:42.605850000 -0500
@@ -51,12 +51,12 @@
 
     <!-- override order for JBossXB to bootstrap properly -->
     <path id="junit.classpath">
+           <path refid="junit.moduleclasspath"/>
            <fileset dir="${lib.dir}">
                  <include name="*.jar"/>
            </fileset>
            <pathelement path="${classes.dir}"/>
            <pathelement path="${testclasses.dir}"/>
-           <path refid="junit.moduleclasspath"/>
            <path refid="lib.class.path"/>
            <path location="${clover.jar}"/>
     </path>
@@ -212,7 +212,7 @@
     </target>
 
-    <target name="junit" depends="compiletest, prepare-test-resources">
-        <mkdir dir="test_output"/>
+    <target name="junit" depends="compiletest">
+        <mkdir dir="${test.out.dir}"/>
         <junit forkmode="once" printsummary="yes" haltonfailure="yes">
             <classpath>
                 <path path="${build.testresources.dir}"/>
@@ -230,7 +230,7 @@
             </classpath>
             <formatter type="plain"/>
             <formatter type="xml"/>
-            <batchtest fork="yes" todir="test_output" haltonfailure="no">
+            <batchtest fork="yes" todir="${test.out.dir}" haltonfailure="no">
             	<fileset refid="junit.batchtestset"/>
             </batchtest>
         </junit>
@@ -239,7 +239,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}">
@@ -267,17 +267,17 @@
             </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>
 
 	<!-- target name="report">
-			<mkdir dir="test_output"/>
-			<junitreport todir="test_output">
-			  <fileset dir="test_output">
+			<mkdir dir="${test.out.dir}"/>
+			<junitreport todir="${test.out.dir}">
+			  <fileset dir="${test.out.dir}">
 				<include name="TEST-*.xml"/>
 			  </fileset>
-			  <report format="frames" todir="test_output/report"/>
+			  <report format="frames" todir="${test.out.dir}/report"/>
 			</junitreport>
 		</target -->
 
@@ -308,13 +308,14 @@
 	<!-- Some of this can probably be moved to common-build... -->
 	<target name="dist" depends="get.deps.core,get.deps.test,jar,jar,javadoc,copysource,copytest,copylib,extras"
 			description="Build everything">
-
+		<!--
 		<ant inheritall="false" dir="${basedir}/doc/reference"/>
 		<copy todir="${dist.dir}/doc/reference" failonerror="false">
 			<fileset dir="${basedir}/doc/reference/build">
 				<include name="**/*.*"/>
 			</fileset>
 		</copy>
+		-->
 
 		<copy todir="${dist.dir}" failonerror="false">
 			<fileset dir="${common.dir}">