tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r793040 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default build.xml
Date Fri, 10 Jul 2009 17:08:36 GMT
Author: fhanik
Date: Fri Jul 10 17:08:35 2009
New Revision: 793040

URL: http://svn.apache.org/viewvc?rev=793040&view=rev
Log:
were not using DBCP anywhere

Modified:
    tomcat/trunk/modules/jdbc-pool/build.properties.default
    tomcat/trunk/modules/jdbc-pool/build.xml

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=793040&r1=793039&r2=793040&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Fri Jul 10 17:08:35 2009
@@ -80,10 +80,11 @@
 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

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=793040&r1=793039&r2=793040&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Jul 10 17:08:35 2009
@@ -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}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message