--- build.xml.old	2006-07-20 14:29:08.000000000 -0400

+++ build.xml	2006-07-20 14:29:35.000000000 -0400

@@ -53,6 +53,8 @@

   <property name="contrib.jar" location="${lib}/${jar.name}"/>

   <property name="jar.main.class" value="net.sf.antcontrib.AntContribVersion"/>

+  <property name="bcel.jar" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />

+

   ######################################################

   ### Build the class and jar file target directories

@@ -153,7 +155,7 @@

     <manifest file="${lib}/MANIFEST.MF">

         <attribute name="Built-By" value="Ant-contrib"/>

         <attribute name="Main-Class" value="${jar.main.class}"/>

-        <attribute name="Class-Path" value="${jar.name}"/>

+        

         <attribute name="Specification-Version" value="${spec.version}"/>

         <attribute name="Specification-Vendor" value="${spec.vendor}"/-->

@@ -349,8 +351,8 @@

       </classpath>

     </junit>

-      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />

-      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />

+

+

   </target>

   <target name="test-all" depends="compile-tests">

@@ -373,7 +375,7 @@

   <target name="get-jar-deps">

       <antcall target="get-dep-maybe">

-          <param name="dep.src" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />

+		  <param name="dep.src" value="${bcel.jar}" />

           <param name="dep.dest" value="${runlib}/bcel-5.1.jar" />

       </antcall>

@@ -384,12 +386,18 @@

   </target>

   <target name="build-ant-testutil" unless="ant.build.testutil.available">

-    

-             dest="${build.ant.dir}">

-          <patternset>

-              <include name="${ant.unzip.dir}/src/testcases/org/apache/tools/ant/BuildFileTest.java"/>

-          </patternset>

-    </unzip>

+    

+			dest="${build.ant.dir}" />

+

+    <delete file="${build.ant.dir}/${ant.src.file}" />

+

+    

+           dest="${build.ant.dir}" />

+

+    <delete file="${build.ant.dir}/${ant.src.tar.file}" />

+    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xml-apis.jar" />

+    <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xercesImpl.jar" />

+	

     <mkdir dir="${testclasses}" />

@@ -408,9 +416,12 @@

                 value="build/ant" />

-                value="1.6.2" />

+                value="1.6.5" />

-                value="apache-ant-${ant.download.version}-src.zip" />

+			  value="apache-ant-${ant.download.version}-src.tar.gz" />

+	  

+			  value="apache-ant-${ant.download.version}-src.tar" />

+

                 value="apache-ant-${ant.download.version}" />

@@ -418,7 +429,7 @@

            usetimestamp="true"

-           src="http://archive.apache.org/dist/ant/source/${ant.src.file}">

+		   src="file://${basedir}/../../../SOURCES/${ant.src.file}">

       </get>