--- common-build.xml.sav	2008-11-12 23:57:59.520049000 -0500
+++ common-build.xml	2008-11-12 23:53:20.445884000 -0500
@@ -18,6 +18,7 @@
     <property name="testclasses.dir" location="${build.dir}/testclasses"/>   
 	<property name="dist.target.dir" location="target"/>
     <property name="dist.dir" location="${dist.target.dir}/${name}"/>
+    <property name="test.out.dir" value="test_output"/>
     <property name="instrumenttest.out.dir" value="instrumenttestout"/>
     <property name="doc.dir" location="doc"/>
     <property name="doc.api.dir" location="${doc.dir}/api"/>
@@ -33,15 +34,14 @@
 	<property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/>
     <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/>   
 
-    <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/>
+    <property name="javadoc" value="http://java.sun.com/j2se/1.5/docs/api"/>
     <property name="javac.debug" value="on"/>
     <property name="javac.optimize" value="off"/>
 	<property name="javac.source" value="1.4"/>
 	<property name="javac.target" value="1.4"/>
 
-
 	<!-- set Hibernate core related properties -->
-    <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/>
+    <property name="hibernate-core.home" location="${common-build.basedir}"/>
     <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
     <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
     <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/>  <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
@@ -240,7 +240,7 @@
     <target name="instrument" depends="compiletest"
 			description="Instrument the persistent classes"> <!-- depends="jar" -->
 
-		<taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
+		<taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
 			<classpath path="${classes.dir}"/>
             <classpath path="${testclasses.dir}"/>         
 			<classpath refid="lib.class.path"/>
@@ -335,9 +335,8 @@
         	protected="true"
         	version="true"
         	windowtitle="${Name} API Documentation"
-        	Overview="${doc.api.dir}/package.html"
         	doctitle="${Name} API Documentation"
-        	stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
+        	stylesheetfile="${doc.api.dir}/jdstyle.css"
         	link="${javadoc}">
         	<packageset dir="${src.dir}" defaultexcludes="yes" >
 		      <include name="**/*" />
@@ -390,12 +389,12 @@
     </target>
 
     <target name="junit" depends="compiletest">
-        <mkdir dir="test_output"/>
+        <mkdir dir="${test.out.dir}"/>
         <junit printsummary="yes" haltonfailure="yes" forkmode="once">
             <classpath refid="junit.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>
@@ -403,17 +402,21 @@
 
 	<!-- 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 refid="junit.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="junitinstrument" depends="compiletest,instrument"
 			description="Run the instrument test suite (requires driver.jar property)">
+		<antcall target="junit" inheritall="true">
+			<param name="test.out.dir" value="${instrumenttest.out.dir}"/>
+		</antcall>
+		<!--
 		<mkdir dir="${instrumenttest.out.dir}"/>
 		<junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
 				maxmemory="256M" fork="yes" forkmode="perBatch">
@@ -421,19 +424,20 @@
 			<formatter type="plain"/>
 			<formatter type="xml"/>
 			<batchtest todir="${instrumenttest.out.dir}" haltonfailure="no">
-				<fileset dir="${classes.dir}">
+				<fileset dir="${testclasses.dir}">
 					<include name="org/hibernate/test/**/*Test.class"/>
 				</fileset>
 			</batchtest>
 		</junit>
+		-->
 	</target>
 
     <target name="junitreport" depends="">
-        <junitreport todir="./test_output">
-            <fileset dir="test_output">
+        <junitreport todir="${test.out.dir}">
+            <fileset dir="${test.out.dir}">
                 <include name="TEST-*.xml"/>
             </fileset>
-            <report format="frames" todir="./test_output"/>
+            <report format="frames" todir="${test.out.dir}"/>
         </junitreport>
     </target>
 
@@ -469,4 +473,4 @@
 		<cvs command="-q diff -u -N" output="patch.txt"/>
 	</target>
 
-</project>
\ No newline at end of file
+</project>