From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 4 May 2006 14:39:23 +0000 (+0000)
Subject: - Use separate build folders for the dependencies.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=02401610e7b56fef6ced29d11691b03af41723aa;p=tomcat7.0

- 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 5b10b6f5a..f8cd0cd50 100644
--- 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
 commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
 
-# ----- Eclipse JDT, version 3.1.2 or later -----
+# ----- Eclipse JDT, version 3.2 or later -----
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.0.v_661.jar
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/S-3.2RC2-200604281315/eclipse-JDT-3.2RC2.zip
 
 # ----- Tomcat native library -----
 tomcat-native.home=${base.path}/tomcat-native-1.1.3
diff --git a/build.xml b/build.xml
index 79c2a0e4e..b0b669bbd 100644
--- a/build.xml
+++ b/build.xml
@@ -49,8 +49,8 @@
   <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
   <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
 
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps" />
-  <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps" />
+  <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />
+  <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
   <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
   <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>