--- common-build.xml.sav	2009-07-18 23:07:45.000000000 -0700
+++ common-build.xml	2009-07-18 23:08:07.000000000 -0700
@@ -24,6 +24,7 @@
 	<property name="testreports.dir" location="${build.dir}/test-reports"/>
 	<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="${build.dir}/test-reports/instrument"/>
 	<property name="doc.dir" location="doc"/>
 	<property name="doc.api.dir" location="${doc.dir}/api"/>
@@ -39,11 +40,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="${build.dir}/pom.xml"/>
 	<property name="src.jar" value="${build.dir}/src.jar"/>
@@ -74,7 +75,7 @@
 		<classpath>
 			<fileset dir="${common-build.basedir}/lib/build">
 				<!-- ${build.lib.dir} fails in reference doc build -->
-				<include name="ant-contrib-*.jar"/>
+				<include name="ant-contrib*.jar"/>
 			</fileset>
 		</classpath>
 	</taskdef>
@@ -293,7 +294,6 @@
 			classpathref="lib.class.path" destdir="${dist.api.dir}" use="true"
 			protected="true" version="true"
 			windowtitle="${Name} API Documentation"
-			Overview="${doc.api.dir}/package.html"
 			doctitle="${Name} API Documentation"
 			stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc}">
 			<packageset dir="${src.dir}" defaultexcludes="yes">
@@ -366,7 +366,7 @@
 		</taskdef>
 		
 		<instrument verbose="true">
-			<fileset dir="${testclasses.dir}/org/hibernate/test">
+			<fileset dir="${testclasses.dir}/org/hibernate/annotations/common/test">
 				<include name="**/*.class"/>
 				<exclude name="**/*Test$*.class"/>
 				<exclude name="**/*Test.class"/>
@@ -376,25 +376,29 @@
 	</target>	
 	
 	<target name="junitinstrument" depends="compiletest,instrument"
-		description="Run the instrument test suite">
+		description="Run the instrument test suite">
+		<!--
 		<for list="${targetdb}" param="db">
 			<sequential>
 				<antcall target="test-resources">
 					<param name="db" value="@{db}"/>
-				</antcall>
-				<mkdir dir="${instrumenttest.out.dir}/@{db}"/>
-				<echo>Running against db: @{db}</echo>
+				</antcall>
+		-->
+				<mkdir dir="${instrumenttest.out.dir}"/>
+				<!-- <echo>Running against db: @{db}</echo> -->
 				<junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
 					maxmemory="256M" fork="yes" forkmode="perBatch">
 					<classpath refid="junit.classpath"/>
 					<formatter type="plain"/>
 					<formatter type="xml"/>
-					<batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no">
+					<batchtest todir="${instrumenttest.out.dir}" haltonfailure="no">
 						<fileset refid="junit.batchtestset"/>
 					</batchtest>
-				</junit>
+				</junit>
+		<!--
 			</sequential>
-		</for>
+		</for>
+		-->
 	</target>
 	
 	<target name="junitreport" depends="">
@@ -449,8 +453,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>