Author: markt
Date: Mon May 12 15:57:36 2014
New Revision: 1594015
URL: http://svn.apache.org/r1594015
Log:
Follow up to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56400
- Update description of DBCP packaging in buidling.txt
- remove DBCP2 and Pool2 versions from build.properties.default
- update svn-merge docs
- remove external tomcat-dbcp.jar from sample Eclipse class path
- remove reference in Javadoc to class that does not exist
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/SVN-MERGE.txt
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1594015&r1=1594014&r2=1594015&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Mon May 12 15:57:36 2014
@@ -45,24 +45,19 @@ source distribution, do the following:
Note regarding later versions of Java:
As documented elsewhere, one of components in Apache Tomcat includes
- a private copy of the Apache Commons DBCP library. The source code
- for this library is downloaded, processed by the build script
- (renaming the packages) and compiled.
-
- Due to changes in JDBC interfaces implemented by the library between
- versions of Java SE specification, the library has to target specific
- version of Java and can be compiled only with the JDK version
- implementing this version of specification.
+ a private copy of the Apache Commons DBCP library.
+
+ The JDBC interfaces implemented by DBCP frequently change in
non-backwards
+ compatible ways between versions of the Java SE specification. Therefore,
+ it is likely that DBCP will only compile with the specific version of
Java
+ listed above and that compilation will fail if a later version of Java is
+ used.
See Apache Commons DBCP project web site for more details on
available versions of the library and its requirements,
http://commons.apache.org/dbcp/
- If you really want to use a later version of JDK to build Tomcat,
- several workarounds are possible. One of them is to skip building
- the component (tomcat-dbcp.jar).
-
3. Install the JDK according to the instructions included with the release.
4. Set an environment variable JAVA_HOME to the pathname of the directory
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1594015&r1=1594014&r2=1594015&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Mon May 12 15:57:36 2014
@@ -32,8 +32,10 @@ org.apache.tomcat.util.bcel is copied fr
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
DBCP
-org.apache.tomcat.dbcp is generated by the build process from Commons DBCP and
-Commons Pool.
+org.apache.tomcat.dbcp.dbcp2 is copied from:
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
+org.apache.tomcat.dbcp.pool2 is copied from:
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2
FileUpload
org.apache.tomcat.util.http.fileupload is copied from:
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1594015&r1=1594014&r2=1594015&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon May 12 15:57:36 2014
@@ -152,18 +152,6 @@ tomcat-native.loc.2=${base-tomcat.loc.2}
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
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 2.0 or later -----
-commons-dbcp.version=2.0
-commons-dbcp.home=${base.path}/commons-dbcp2-${commons-dbcp.version}-src
-commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-
-# ----- Commons Pool, version 2.1 or later -----
-commons-pool.version=2.2
-commons-pool.home=${base.path}/commons-pool2-${commons-pool.version}-src
-commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
-commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
-
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.46
nsis.exe=${nsis.home}/makensis.exe
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java?rev=1594015&r1=1594014&r2=1594015&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java Mon May 12
15:57:36 2014
@@ -39,8 +39,7 @@
* </p><p>
* A: The {@link org.apache.tomcat.dbcp.pool2.ObjectPool ObjectPool}
interface is defined
* in Commons Pool. You can use one of the provided implementations such as
- * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool
GenericObjectPool},
- * {@link org.apache.tomcat.dbcp.pool2.proxy.ProxiedObjectPool
ProxiedObjectPool} or
+ * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool
GenericObjectPool} or
* {@link org.apache.tomcat.dbcp.pool2.impl.SoftReferenceObjectPool
SoftReferenceObjectPool}
* or you can create your own.
* </p>
Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1594015&r1=1594014&r2=1594015&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon May 12 15:57:36
2014
@@ -22,7 +22,6 @@
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/tomcat8-deps/dbcp/tomcat-dbcp.jar"
sourcepath="/TOMCAT_LIBS_BASE/tomcat8-deps/dbcp/src/java"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-P20140317-1600/ecj-P20140317-1600.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
