Author: markt
Date: Thu May 15 14:36:46 2014
New Revision: 1594931
URL: http://svn.apache.org/r1594931
Log:
Copy missing resources file from Apache Commons DBCP 2 to packaged renamed copy
of DBCP 2
Added:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties
- copied unchanged from r1594514,
commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2/LocalStrings.properties
Modified:
tomcat/trunk/SVN-MERGE.txt
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1594931&r1=1594930&r2=1594931&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Thu May 15 14:36:46 2014
@@ -34,6 +34,8 @@ org.apache.tomcat.util.bcel is copied fr
DBCP
org.apache.tomcat.dbcp.dbcp2 is copied from:
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
+and
+/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2
org.apache.tomcat.dbcp.pool2 is copied from:
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1594931&r1=1594930&r2=1594931&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 15 14:36:46 2014
@@ -72,6 +72,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Copy missing resources file from Apache Commons DBCP 2 to packaged
+ renamed copy of DBCP 2. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.6 (markt)">
<subsection name="Catalina">
@@ -427,7 +435,7 @@
Javadoc fixes and some code clean up. (markt)
</update>
<scode>
- Switch to including Apache Commons DBCP via a package renamed svn copy
+ Switch to including Apache Commons DBCP via a package renamed svn copy
rather than building from a source release for consistency with other
Commons packages and to allow faster releases to fix DBCP related
issues. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
