diff -uprN rhino1_6R1.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml rhino1_6R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
--- rhino1_6R1.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2004-12-22 19:04:10.309826472 +0100
+++ rhino1_6R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2004-12-22 19:06:04.299497408 +0100
@@ -3,7 +3,6 @@
 <project name="toolsrc" default="help" basedir=".">
 
   <target name="properties">
-    <property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/>
     <available file="downloaded/AbstractCellEditor.java"
                property="swing-ex-available"/>
   </target>
@@ -13,8 +12,7 @@
          the files we don't need, and change the package
     -->
     <mkdir dir="downloaded"/>
-    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
-    <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
+    <unzip src="../../../../../../swingExSrc.zip" dest="downloaded/">
       <patternset>
           <include name="AbstractCellEditor.java"/>
           <include name="JTreeTable.java"/>
diff -uprN rhino1_6R1.orig/xmlimplsrc/build.xml rhino1_6R1/xmlimplsrc/build.xml
--- rhino1_6R1.orig/xmlimplsrc/build.xml	2004-12-22 19:04:10.315825560 +0100
+++ rhino1_6R1/xmlimplsrc/build.xml	2004-12-22 19:06:15.685766432 +0100
@@ -12,7 +12,6 @@
   <target name="compile" unless="without-xmlimpl">
 
     <available property="xbean-present?" file="${xbean.jar}" /> 
-    <antcall target="xbean-get" />
 
     <condition property="xmlimpl-compile?">
       <and>
@@ -35,7 +34,6 @@
     </condition>
 
     <antcall target="do-compile" />
-    <antcall target="do-not-compile" />
   
   </target>
     
@@ -55,15 +53,6 @@
 
   </target>
 
-  <target name="do-not-compile" unless="xmlimpl-compile?">
-
-<echo>
-Skipping compilation of E4X implementation due to lack of 
-javax.xml.namespace.*, org.apache.xmlbeans.*  classes
-</echo>
-
-  </target>
-
   <target name="copy-source">
     <mkdir dir="${dist.dir}/xmlimplsrc"/>
     <copy todir="${dist.dir}/xmlimplsrc">
@@ -79,39 +68,4 @@ javax.xml.namespace.*, org.apache.xmlbea
                includes="org/mozilla/javascript/xmlimpl/**"/>
     </delete>
   </target>
-
-
-  <target name="xbean-get" unless="xbean-present?">
-  
-    <property 
-     name="xbean.url" 
-     value="http://www.apache.org/dist/xml/xmlbeans/xmlbeans-current.zip"
-     />
-
-    <property name="xbean.tmp" location="${build.dir}/tmp-xbean" /> 
-    <property name="xbean.zip" location="${xbean.tmp}/xbean.zip" /> 
-
-    <mkdir dir="${xbean.tmp}"/>
-    <get src="${xbean.url}" dest="${xbean.zip}" ignoreerrors="true" />
-
-    <available property="xbean-zip-present?" file="${xbean.zip}" /> 
-    
-    <antcall target="xbean-unzip" />
-  </target>
-
-  <target name="xbean-unzip" if="xbean-zip-present?">
-    
-    <unzip src="${xbean.zip}" dest="${xbean.tmp}">
-      <patternset includes="xmlbeans-*/lib/xbean.jar" />
-    </unzip>
-    <mkdir dir="${lib}" />
-    <copy tofile="${xbean.jar}">
-      <fileset dir="${xbean.tmp}" includes="xmlbeans-*/lib/xbean.jar" />
-    </copy>
-
-    <delete dir="${xbean.tmp}" />
-  </target>
-
-
-
 </project>