--- common-build.xml.sav	2006-05-13 13:58:40.000000000 -0400
+++ common-build.xml	2006-08-02 13:49:55.000000000 -0400
@@ -211,8 +211,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 +225,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"/>
@@ -322,7 +322,7 @@
         	windowtitle="${Name} API Documentation"
         	Overview="${doc.api.dir}/package.html"
         	doctitle="${Name} API Documentation"
-        	stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
+        	stylesheetfile="doc/api/jdstyle.css"
         	link="${javadoc}">
         	<packageset dir="${src.dir}" defaultexcludes="yes" >
 		      <include name="**/*" />
@@ -443,4 +443,4 @@
 		<cvs command="-q diff -u -N" output="patch.txt"/>
 	</target>
 
-</project>
\ No newline at end of file
+</project>