--- build/build.xml.p2 2006-03-23 19:51:48.000000000 +0100 +++ build/build.xml 2006-03-24 10:18:41.000000000 +0100 @@ -58,12 +58,14 @@ <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" /> + <property name="tomcat-dbcp.home" value="${base.path}" /> <property name="tomcat-dbcp.jar" - value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/> + value="${tomcat-dbcp.home}/commons-dbcp.jar"/> +<!-- <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" /> <property name="jasper-compiler-jdt.jar" value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/> +--> <!-- Some compilers will disable debugging if true. And it doesn't do anything in most cases --> @@ -159,11 +161,17 @@ 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 =================== --> @@ -957,7 +965,9 @@ <copy todir="embed/lib"> <fileset dir="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>