Author: markt
Date: Thu Aug 1 18:25:22 2013
New Revision: 1509370
URL: http://svn.apache.org/r1509370
Log:
Update Tomcat 8 to the latest DBCP2 snapshot
Removed:
tomcat/trunk/res/dbcp/
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/naming/factory/Constants.java
tomcat/trunk/res/maven/tomcat-dbcp.pom
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Aug 1 18:25:22 2013
@@ -148,16 +148,27 @@ tomcat-native.win.1=${base-tomcat.loc.1}
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
# ----- Commons DBCP, version 1.1 or later -----
-commons-dbcp.version=1.4
-commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
-commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+#commons-dbcp.version=1.4
+#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
+#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp.version=2.0-20130801.161025-126
+commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
+commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.version=1.5.7
-commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
-commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
-commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#commons-pool.version=1.5.7
+#commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
+#commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#Temporary use of snapshots until Commons Pool 2 has its first release
+commons-pool.version=2.0-20130801.160158-233
+commons-pool.home=${base.path}/commons-pool2-2.0-SNAPSHOT-src
+commons-pool-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
+
+
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.46
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 1 18:25:22 2013
@@ -598,7 +598,7 @@
</copy>
</target>
- <target name="compile"
depends="build-prepare,download-compile,compile-prepare,validate">
+ <target name="compile" depends="build-prepare,compile-prepare,validate">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -653,7 +653,7 @@
</target>
- <target name="package" depends="compile,build-manifests" >
+ <target name="package" depends="compile,download-compile,build-manifests" >
<!-- Common Annotations 1.0 JAR File -->
<jarIt jarfile="${annotations-api.jar}"
filesDir="${tomcat.classes}"
@@ -2440,7 +2440,7 @@ Apache Tomcat ${version} native binaries
</target>
- <target name="download-compile"
+ <target name="download-compile" depends="compile"
description="Download (and build) components necessary to compile" >
<antcall target="downloadfile-2">
@@ -2554,11 +2554,14 @@ Apache Tomcat ${version} native binaries
<!-- ================ be built rather than used directly ================
-->
<target name="build-tomcat-dbcp" depends="build-manifests"
unless="no.build.dbcp">
- <copy todir="${tomcat-dbcp.home}">
- <fileset dir="${commons-pool.home}">
+ <!-- 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" />
<exclude name="**/test/**" />
</fileset>
+ </copy>
+ <copy todir="${tomcat-dbcp.home}">
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
@@ -2566,20 +2569,18 @@ Apache Tomcat ${version} native binaries
</fileset>
</copy>
- <patch patchfile="${basedir}/res/dbcp/dbcp-java-7.patch"
- dir="${tomcat-dbcp.home}"
- ignorewhitespace="true"
- strip="0"/>
-
+ <!-- Package rename to avoid clashes with the same classes in webapps -->
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
</replace>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+
+ <!-- Depend on JULI rather than Commons-Logging -->
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
encoding="ISO-8859-1">
- <replacefilter token="enum"
- value="enumeration" />
+ <replacefilter token="org.apache.tomcat.dbcp.logging"
+ value="org.apache.juli.logging" />
</replace>
<mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
@@ -2598,6 +2599,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
includeantruntime="false">
<include name="**" />
+ <classpath path="${tomcat.classes}" />
</javac>
<jarIt jarfile="${tomcat-dbcp.jar}"
filesDir="${tomcat-dbcp.home}/classes"
Modified: tomcat/trunk/java/org/apache/naming/factory/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/Constants.java?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/Constants.java Thu Aug 1
18:25:22 2013
@@ -49,7 +49,7 @@ public final class Constants {
Package + ".HandlerFactory";
public static final String DBCP_DATASOURCE_FACTORY =
- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
+ "org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory";
public static final String OPENEJB_EJB_FACTORY =
Package + ".OpenEjbFactory";
Modified: tomcat/trunk/res/maven/tomcat-dbcp.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-dbcp.pom?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-dbcp.pom (original)
+++ tomcat/trunk/res/maven/tomcat-dbcp.pom Thu Aug 1 18:25:22 2013
@@ -29,4 +29,12 @@
<distribution>repo</distribution>
</license>
</licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Aug 1 18:25:22 2013
@@ -595,7 +595,7 @@
<property name="javax.sql.DataSource.Factory">
<p>The class name of the factory to use to create resources of type
<code>javax.sql.DataSource</code>. If not specified the default of
- <code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code> is used
+ <code>org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory</code> is used
which is a package renamed (to avoid conflictions) copy of
<a href="http://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p>
</property>
Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Thu Aug 1
18:25:22 2013
@@ -126,7 +126,7 @@ only the classes needed for connection p
packages have been renamed to avoid interfering with applications.
</p>
-<p>DBCP 1.4 provides support for JDBC 4.0.</p>
+<p>DBCP 2.0 provides support for JDBC 4.1.</p>
<subsection name="Installation">
Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1509370&r1=1509369&r2=1509370&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Thu Aug 1 18:25:22 2013
@@ -684,7 +684,7 @@ conn.close();
<p>The configuration properties for Tomcat's standard data source
resource factory
- (<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code>) are
+ (<code>org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory</code>) are
as follows:</p>
<ul>
<li><strong>driverClassName</strong> - Fully qualified Java class name
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
