--- common-build.xml.sav	2008-07-02 12:09:15.000000000 -0400
+++ common-build.xml	2008-07-02 21:49:59.000000000 -0400
@@ -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,13 +34,13 @@
 	<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"/>
 
 
     <!-- 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 -->
@@ -193,8 +194,8 @@
             value="org.eclipse.jdt.core.JDTCompilerAdapter"
             classpath="${java.class.path}"/>
         <javac
-        	target="1.4"
-            source="1.4"   
+        	target="1.5"
+            source="1.5"   
             srcdir="${src.dir}"
             destdir="${classes.dir}"
             classpathref="lib.class.path"
@@ -211,8 +212,8 @@
 			value="org.eclipse.jdt.core.JDTCompilerAdapter"
 			classpath="${java.class.path}"/>
 		<javac
-            target="1.4"
-            source="1.4"   
+            target="1.5"
+            source="1.5"   
 			destdir="${testclasses.dir}"
 			classpathref="junit.classpath"
 			debug="${javac.debug}"
@@ -225,14 +226,14 @@
     <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"/>
 		</taskdef>
 
 		<instrument verbose="true">
-			<fileset dir="${testclasses.dir}/org/hibernate/test">
+			<fileset dir="${testclasses.dir}/org/hibernate/ejb/test">
 				<include name="**/*.class"/>
 				<exclude name="**/*Test$*.class"/>
 				<exclude name="**/*Test.class"/>
@@ -320,9 +321,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="**/*" />
@@ -388,6 +388,10 @@
 
     <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">
@@ -395,11 +399,12 @@
 			<formatter type="plain"/>
 			<formatter type="xml"/>
 			<batchtest todir="${instrumenttest.out.dir}" haltonfailure="no">
-				<fileset dir="${classes.dir}">
-					<include name="org/hibernate/test/**/*Test.class"/>
+				<fileset dir="${testclasses.dir}">
+					<include name="org/hibernate/ejb/test/**/*Test.class"/>
 				</fileset>
 			</batchtest>
 		</junit>
+        -->
 	</target>
 
     <target name="junitreport" depends="">
@@ -443,4 +448,4 @@
 		<cvs command="-q diff -u -N" output="patch.txt"/>
 	</target>
 
-</project>
\ No newline at end of file
+</project>