Author: markt
Date: Fri May 14 18:54:22 2010
New Revision: 944390
URL: http://svn.apache.org/viewvc?rev=944390&view=rev
Log:
Update DBCP to 1.3
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=944390&r1=944389&r2=944390&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 14 18:54:22 2010
@@ -266,8 +266,3 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=940064&view=rev
+1: kkolinko, markt, kfujino
-1:
-
-* Update to DBCP 1.3
- http://people.apache.org/~markt/patches/2010-05-06-dbcp13-tc6.patch
- +1: markt, kkolinko, kfujino
- -1:
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=944390&r1=944389&r2=944390&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Fri May 14 18:54:22 2010
@@ -69,13 +69,14 @@ tomcat-native.loc=${base-tomcat.loc}/tom
tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
# ----- Commons DBCP, version 1.1 or later -----
-commons-dbcp.version=1.2.2
-commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp.version=1.3
+commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.5.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
+commons-pool.version=1.5.4
+commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.46
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=944390&r1=944389&r2=944390&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri May 14 18:54:22 2010
@@ -781,6 +781,7 @@
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
+ <exclude name="**/managed/**" />
</fileset>
</copy>
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=944390&r1=944389&r2=944390&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 14 18:54:22 2010
@@ -37,9 +37,16 @@
<body>
<!-- Section names:
- Catalina, Coyote, Jasper, Cluster, Webapps, Other
+ General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 6.0.27 (jfclere)">
+ <subsection name="General">
+ <changelog>
+ <update>
+ Update DBCP to 1.3. (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
