Author: kkolinko
Date: Fri Feb 7 01:34:16 2014
New Revision: 1565512
URL: http://svn.apache.org/r1565512
Log:
Fix build of DBCP2. The project structure has changed and
the classes are now in src/main, like in Pool2.
This issue was reported in the VOTE thread for 8.0.2.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1565512&r1=1565511&r2=1565512&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Feb 7 01:34:16 2014
@@ -2723,7 +2723,6 @@ Apache Tomcat ${version} native binaries
<!-- ================ be built rather than used directly ================
-->
<target name="build-tomcat-dbcp" depends="build-manifests"
unless="no.build.dbcp">
- <!-- Pool2 and DBCP2 currently have slightly different source structures
-->
<copy todir="${tomcat-dbcp.home}/src">
<fileset dir="${commons-pool.home}/src/main">
<include name="**/*.java" />
@@ -2731,8 +2730,8 @@ Apache Tomcat ${version} native binaries
<exclude name="**/proxy/**" />
</fileset>
</copy>
- <copy todir="${tomcat-dbcp.home}">
- <fileset dir="${commons-dbcp.home}">
+ <copy todir="${tomcat-dbcp.home}/src">
+ <fileset dir="${commons-dbcp.home}/src/main">
<include name="**/*.java" />
<exclude name="**/test/**" />
<exclude name="**/managed/**" />
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1565512&r1=1565511&r2=1565512&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 7 01:34:16 2014
@@ -44,7 +44,16 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
-<section name="Tomcat 8.0.2 (markt)">
+<section name="Tomcat 8.0.3 (markt)">
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Fix build of Apache Commons DBCP2 classes. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+<section name="Tomcat 8.0.2 (markt)" rtext="not released">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
