were not using DBCP anywhere

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

diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default
index b882384..1c5d9f4 100644 (file)
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -80,10 +80,11 @@ dbcp.home=${base.path}/commons-dbcp-1.2
 dbcp.jar=${dbcp.home}/commons-dbcp-1.2.jar
 dbcp.loc=http://archive.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.zip
 
-tomcat.home=${base.path}/apache-tomcat-6.0.20
+tomcat.version=6.0.20
+tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
 tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
 tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
-tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip
+tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
 
 tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
 tomcat.project.dest=${base.path}/project.xml

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 2da561d..19f3a4c 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -59,7 +59,6 @@
     <pathelement location="${tomcat.testclasses}"/>
     <pathelement location="${c3p0.jar}"/>
     <pathelement location="${mysql.jar}"/>
-    <pathelement location="${dbcp.jar}"/>
     <pathelement location="${junit.jar}"/>
     <pathelement location="${tomcat.dbcp.jar}"/>
     <pathelement location="${derby.jar}"/>
@@ -310,11 +309,13 @@
   
   <target name="download">
     <mkdir dir="${base.path}"/>
+<!-- 
     <antcall target="downloadzip">
       <param name="sourcefile" value="${dbcp.loc}"/>
       <param name="destfile" value="${dbcp.jar}"/>
       <param name="destdir" value="${base.path}"/>
     </antcall>
+ -->    
     <antcall target="downloadzip">
       <param name="sourcefile" value="${tomcat.loc}"/>
       <param name="destfile" value="${tomcat.juli.jar}"/>