--- common-build.xml.sav	2009-07-19 14:53:04.000000000 -0700
+++ common-build.xml	2009-07-19 14:54:15.000000000 -0700
@@ -34,11 +34,11 @@
 	<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"/>
+	<property name="javac.source" value="1.5"/>
+	<property name="javac.target" value="1.5"/>
 
     <property name="pom.file" value="pom.xml"/>
     <property name="src.jar" value="${build.dir}/src.jar"/>
@@ -227,14 +227,12 @@
     <target name="instrument" depends="compiletest"
 			description="Instrument the persistent classes"> <!-- depends="jar" -->
 
-		<taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
-			<classpath path="${classes.dir}"/>
-            <classpath path="${testclasses.dir}"/>         
-			<classpath refid="lib.class.path"/>
+		<taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
+			<classpath refid="junit.classpath"/>
 		</taskdef>
 
 		<instrument verbose="true">
-			<fileset dir="${testclasses.dir}/org/hibernate/test">
+			<fileset dir="${testclasses.dir}/org/hibernate/validator/test">
 				<include name="**/*.class"/>
 				<exclude name="**/*Test$*.class"/>
 				<exclude name="**/*Test.class"/>
@@ -408,8 +406,8 @@
 			<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/validator/test/**/*Test.class"/>
 				</fileset>
 			</batchtest>
 		</junit>
@@ -476,8 +474,8 @@
           <remoteRepository refId="offline.repository.jboss.org">
           </remoteRepository>
           <attach file="${src.jar}" classifier="sources" />
-            <attach file="${jar.file.name}" classifier="" />
+          <!-- <attach file="${jar.file.name}" classifier="" /> -->
         </artifact:deploy>
     </target>
 
-</project>
\ No newline at end of file
+</project>