--- build/build.xml.orig	2009-12-09 10:00:43.000000000 -0500
+++ build/build.xml	2009-12-09 10:17:03.000000000 -0500
@@ -77,10 +77,10 @@
   <property name="tomcat.release"   value="${basedir}/release"/>
   <property name="webapps.build"    value="${catalina.home}/webapps/build"/>
   <property name="webapps.dist"     value="${catalina.home}/webapps/dist"/>
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps/dbcp" />
+  <property name="tomcat-dbcp.home" value="${base.path}" />
   <property name="tomcat-dbcp.jar"
-       value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
-  <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps/jdt" />
+       value="${tomcat-dbcp.home}/commons-dbcp.jar"/>
+  <property name="jasper-compiler-jdt.home" value="./jasper-compiler-jdt-home" />
   <property name="jasper-compiler-jdt.jar"
        value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
 
@@ -178,11 +178,16 @@
             failonerror="false" />
 
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-            file="${tomcat-native.tar.gz}" />
+            file="${tomcat-native.tar.gz}"
+            failonerror="false" />
 
     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
+<!--
     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
+-->
+<!-- these should be links -->
+    <copy todir="${tomcat.build}/common/lib" file="${base.path}/jdtcore.jar" failonerror="false"/>
   </target>
 
   <!-- ====================== Build all components =================== -->
@@ -985,7 +990,8 @@
     <copy todir="${tomcat.embed}/lib">
       <fileset dir="${tomcat.build}/common/lib">
         <include name="jasper-compiler.jar"/>
-        <include name="jasper-compiler-jdt.jar"/>
+        <!-- <include name="jasper-compiler-jdt.jar"/> -->
+        <include name="jdtcore.jar"/>
       </fileset>
     </copy>