- Use separate build folders for the dependencies.

- Update to Eclipse 3.2 (RC 2 right now).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@399714 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 5b10b6f..f8cd0cd 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -30,11 +30,11 @@ commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
 commons-logging.jar=${commons-logging.lib}/commons-logging.jar\r
 commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz\r
 \r
-# ----- Eclipse JDT, version 3.1.2 or later -----\r
+# ----- Eclipse JDT, version 3.2 or later -----\r
 jdt.home=${base.path}/eclipse/plugins\r
 jdt.lib=${jdt.home}\r
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar\r
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip\r
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.0.v_661.jar\r
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/S-3.2RC2-200604281315/eclipse-JDT-3.2RC2.zip\r
 \r
 # ----- Tomcat native library -----\r
 tomcat-native.home=${base.path}/tomcat-native-1.1.3\r

diff --git a/build.xml b/build.xml
index 79c2a0e..b0b669b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -49,8 +49,8 @@
   <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>\r
   <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>\r
 \r
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps" />\r
-  <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps" />\r
+  <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />\r
+  <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />\r
   <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>\r
   <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>\r
 \r