--- eclipsePlugin-1.2.1.20070531/build.xml.orig	2007-05-27 22:45:28.000000000 +0200
+++ eclipsePlugin-1.2.1.20070531/build.xml	2007-07-06 09:51:51.000000000 +0200
@@ -39,13 +39,15 @@
 		<fileset dir="${eclipsePlugin.dir}">
 			<include name="org.eclipse*.jar"/>
 		</fileset>
-		<fileset file="findbugs.jar"/>
-		<fileset file="bcel.jar"/>
-		<fileset file="dom4j-full.jar"/>
+		<fileset file="findbugs/findbugs.jar"/>
+		<fileset file="bcel5.3.jar"/>
+		<fileset file="dom4j.jar"/>
+		<fileset file="jaxen.jar"/>
 	</path>
 	
 	<path id="tools.classpath">
-		<pathelement location="dom4j-full.jar"/>
+		<pathelement location="dom4j.jar"/>
+		<pathelement location="jaxen.jar"/>
 		<pathelement location="${bin.dir}/classes"/>
 	</path>
 
@@ -58,7 +60,7 @@
 	<target name="clean" depends="init" description="Clean up temporary files">
 		<delete>
 			<fileset dir="${dist.dir}" includes="**"/>
-			<fileset dir="${fbeclipse.dir}" includes="findbugs.jar,bcel.jar,annotations.jar"/>
+			<fileset dir="${fbeclipse.dir}" includes="findbugs.jar,annotations.jar"/>
 			<fileset dir="${fbeclipse.dir}/plugin" includes="coreplugin.jar"/>
 		</delete>
 		<delete>
@@ -118,7 +120,7 @@
 
         <target name="CheckOneFourCompatibility">
    <property name="findbugs.home" value="${findbugs.dir}" />
-    <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.dir}/lib/findbugs-ant.jar"/>
+    <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.dir}/findbugs-ant.jar"/>
     <findbugs home="${findbugs.home}"
               output="text"
                 quietErrors="true"
@@ -243,12 +245,5 @@
 	</target>
 
 	<target name="fbjars" description="Copy required jar files from the main findbugs project (which should be a sibling of this project)">
-		<ant dir="${findbugs.dir}" inheritall="false" target="build"/>
-		<copy todir="${fbeclipse.dir}">
-			<fileset dir="${findbugs.dir}/lib" includes="findbugs.jar,bcel.jar,annotations.jar"/>
-		</copy>
-		<copy todir="${fbeclipse.dir}/plugin">
-			<fileset dir="${findbugs.dir}/plugin" includes="coreplugin.jar"/>
-		</copy>
 	</target>
 </project>