--- bin/build.xml.orig	2009-01-27 13:24:02.000000000 -0700
+++ bin/build.xml	2010-06-02 09:32:41.472666527 -0600
@@ -14,8 +14,7 @@
 
	<property name="asm.version" value="3.1" />
 	<property name="jaxen.version" value="1.1.1" />
-	<property name="junit.version" value="4.4" />
-	<property name="retroweaver.version" value="2.0.5" />
+	<property name="junit.version" value="4.6" />
 	<property name="javacc-home.path" value="${dir.lib}" />
 
 	<!--Settings-->
@@ -23,10 +22,12 @@
 
 	<path id="dependencies.path">
 		<pathelement location="${dir.build}" />
-		<fileset dir="${dir.lib}">
+		<fileset dir="/usr/share/java">
 			<include name="jaxen-${jaxen.version}.jar" />
+			<include name="junit4-${junit.version}.jar" />
+		</fileset>
+		<fileset dir="/usr/share/java/objectweb-asm">
 			<include name="asm-${asm.version}.jar" />
-			<include name="junit-${junit.version}.jar" />
 		</fileset>
 	</path>
 
@@ -78,7 +79,7 @@
 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
 			<manifest>
 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
-				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
+				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar objectweb-asm/asm-${asm.version}.jar" />
 			</manifest>
 		</jar>
 
@@ -88,58 +89,6 @@
 			basedir="${dir.build}" />
 	</target>
 
-	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
-		<classpath>
-			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
-			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-		</classpath>
-	</taskdef>
-
-	<target name="weavejunit" depends="jar">
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/junit-${junit.version}.jar" outputjar="${dir.lib14}/junit.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-	</target>
-
-	<target name="weave" depends="jar, weavejunit">
-		<fail unless="ant.jar" message="ant.jar location is not defined properly" />
-		<fail unless="jvm14.runtime" message="jvm14.runtime (i.e. rt.jar) location is not defined properly" />
-
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/pmd14-${version}.jar" />
-			<pathelement location="${dir.lib14}/pmd14-test-${version}.jar" />
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/pmd-${version}.jar" outputjar="${dir.lib14}/pmd14-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-
-		<retroweaver inputjar="${dir.lib}/pmd-test-${version}.jar" outputjar="${dir.lib14}/pmd14-test-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-	</target>
-
 	<target name="jarsrc" depends="copy,compile" description="Jars up the source directory">
 		<jar jarfile="${dir.lib}/pmd-src-${version}.jar" basedir="${dir.src}" />
 	</target>
@@ -249,44 +198,6 @@
 		</concat>
 	</target>
 
-	<path id="dependencies14.path">
-		<fileset dir="${dir.lib14}">
-			<include name="backport-util-concurrent.jar" />
-			<include name="pmd14-${version}.jar" />
-			<include name="pmd14-test-${version}.jar" />
-			<include name="retroweaver-rt-${retroweaver.version}.jar" />
-			<include name="junit.jar" />
-		</fileset>
-		<fileset dir="${dir.lib}">
-			<include name="jaxen-${jaxen.version}.jar" />
-			<include name="asm-${asm.version}.jar" />
-		</fileset>
-	</path>
-
-	<target name="test14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the unit tests with 1.4 jvm">
-		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
-		<antcall target="test-execute">
-			<param name="test.outputdir" value="${dir.build}/reports14"/>
-			<param name="test.jvm" value="${jvm14.exe}"/>
-			<param name="test.dependencies" value="dependencies14.path"/>
-			<param name="test.regression" value="false"/>
-			<param name="test.printsummary" value="true"/>
-		</antcall>
-	</target>
-
-	<target name="regress14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the regression unit tests with 1.4 jvm">
-		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
-		<antcall target="test-execute">
-			<param name="test.outputdir" value="${dir.build}/reports14"/>
-			<param name="test.jvm" value="${jvm14.exe}"/>
-			<param name="test.dependencies" value="dependencies14.path"/>
-			<param name="test.regression" value="true"/>
-			<param name="test.printsummary" value="false"/>
-		</antcall>
-	</target>
-
 	<target name="symtabtest" depends="compile" description="Runs the unit tests for the symboltable package">
 		<junit printsummary="yes" haltonfailure="yes">
 			<classpath>
@@ -424,7 +335,7 @@
 
 	<target name="clean" depends="delete,compile,copy" description="Does a complete recompile" />
 
-	<target name="dist" depends="clean,jar,weave" description="Preps things for a release" />
+	<target name="dist" depends="clean,jar" description="Preps things for a release" />
 
 	<target name="cpdjnlp" depends="dist" description="Uploads a new CPD JNLP thingy to the PMD web site">
 		<signjar jar="${dir.lib}/pmd-${version}.jar" storetype="${keystore.type}" alias="${keystore.alias}" keystore="${keystore.path}" storepass="${keystore.password}" />
@@ -466,18 +377,20 @@
 	<target name="javadoc" description="Generates Javadocs">
 		<mkdir dir="docs/api" />
 
-		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes">
+		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes" Encoding="latin1">
 			<tag name="todo" enabled="false"/>
 			<classpath>
 				<fileset dir="${dir.lib}">
 					<include name="*.jar" />
 				</fileset>
 				<pathelement location="${ant.jar}" />
+				<path refid="dependencies.path" />
 			</classpath>
+			<link href="file:///usr/share/javadoc/objectweb-asm/" />
 		</javadoc>
 	</target>
 
-	<target name="qa" depends="dist, regress, regress14, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
+	<target name="qa" depends="dist, regress, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
 
 </project>