--- common-build.xml.sav	2008-07-13 22:01:31.000000000 -0400
+++ common-build.xml	2008-07-13 22:11:00.000000000 -0400
@@ -39,7 +39,7 @@
 
 
     <!-- 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 -->
@@ -225,7 +225,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"/>
@@ -300,7 +300,16 @@
 
     <target name="jar" depends="compile" description="Build the distribution .jar file">
         <mkdir dir="${dist.dir}"/>
-        <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/>
+        <jar filesetmanifest="merge" jarfile="${jar.file.name}">
+            <fileset dir="${classes.dir}">
+                <exclude name="org/hibernate/annotationfactory/*.*"/>
+                <exclude name="org/hibernate/reflection/*.*"/>
+                <exclude name="org/hibernate/reflection/java/Java*.*"/>
+                <exclude name="org/hibernate/reflection/java/Pair*.*"/>
+                <exclude name="org/hibernate/reflection/java/generics/*.*"/>
+                <exclude name="org/hibernate/validator/**"/>
+            </fileset>
+        </jar>
     </target>
 
     <target name="jartest" depends="compiletest" description="Build the distribution .jar file">
@@ -320,9 +329,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="**/*" />
@@ -395,7 +403,7 @@
 			<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>
@@ -443,4 +451,4 @@
 		<cvs command="-q diff -u -N" output="patch.txt"/>
 	</target>
 
-</project>
\ No newline at end of file
+</project>