Return-Path: 
 <dev-return-149907-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 18DB112DEB
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sun, 11 May 2014 01:54:07 +0000 (UTC)
Received: (qmail 47645 invoked by uid 500); 10 May 2014 23:29:45 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 24936 invoked by uid 500); 10 May 2014 23:21:16 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 70067 invoked by uid 99); 10 May 2014 23:09:03 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 23:09:03 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 May 2014 15:26:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C51FA2388A3D
	for <dev@tomcat.apache.org>; Fri,  9 May 2014 15:25:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1593563 [1/2] - in /tomcat/trunk: ./
 java/org/apache/tomcat/dbcp/ java/org/apache/tomcat/dbcp/dbcp2/
 java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/
 java/org/apache/tomcat/dbcp/dbcp2/datasources/
 java/org/apache/tomcat/dbcp/dbcp2/managed/ j...
Date: Fri, 09 May 2014 15:25:45 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140509152548.C51FA2388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Fri May  9 15:25:43 2014
New Revision: 1593563

URL: http://svn.apache.org/r1593563
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56400
Switch to svn copy for DBCP2 and Pool2

Added:
    tomcat/trunk/java/org/apache/tomcat/dbcp/   (with props)
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
      - copied from r1593515, commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/
      - copied from r1593515, commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/
Removed:
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/proxy/
Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectState.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/SwallowedExceptionListener.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/TrackedUse.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/UsageTracking.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionConfig.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionPolicy.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolMXBean.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
    tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
    tomcat/trunk/res/checkstyle/org-import-control.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1593563&r1=1593562&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri May  9 15:25:43 2014
@@ -97,6 +97,7 @@
   <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
   <property name="catalina-storeconfig.jar" value="${tomcat.build}/lib/catalina-storeconfig.jar"/>
   <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
+  <property name="tomcat-dbcp.jar" value="${tomcat.build}/lib/tomcat-dbcp.jar"/>
   <property name="tomcat-jni.jar" value="${tomcat.build}/lib/tomcat-jni.jar"/>
   <property name="tomcat-spdy.jar" value="${tomcat.build}/lib/tomcat-spdy.jar"/>
   <property name="tomcat-api.jar" value="${tomcat.build}/lib/tomcat-api.jar"/>
@@ -106,9 +107,6 @@
   <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
   <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
 
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat${version.major}-deps/dbcp" />
-  <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
-
   <!-- Standard Source JARs -->
   <property name="bootstrap-src.jar" value="${tomcat.src.jars}/bootstrap-src.jar"/>
   <property name="tomcat-juli-src.jar" value="${tomcat.src.jars}/tomcat-juli-src.jar"/>
@@ -127,6 +125,7 @@
   <property name="tomcat-jni-src.jar" value="${tomcat.src.jars}/tomcat-jni-src.jar"/>
   <property name="tomcat-spdy-src.jar" value="${tomcat.src.jars}/tomcat-spdy-src.jar"/>
   <property name="tomcat-coyote-src.jar" value="${tomcat.src.jars}/tomcat-coyote-src.jar"/>
+  <property name="tomcat-dbcp-src.jar" value="${tomcat.src.jars}/tomcat-dbcp-src.jar"/>
   <property name="tomcat-api-src.jar" value="${tomcat.src.jars}/tomcat-api-src.jar"/>
   <property name="tomcat-util-src.jar" value="${tomcat.src.jars}/tomcat-util-src.jar"/>
   <property name="tomcat-util-scan-src.jar" value="${tomcat.src.jars}/tomcat-util-scan-src.jar"/>
@@ -134,8 +133,6 @@
   <property name="jasper-src.jar" value="${tomcat.src.jars}/jasper-src.jar"/>
   <property name="jasper-el-src.jar" value="${tomcat.src.jars}/jasper-el-src.jar"/>
 
-  <property name="tomcat-dbcp-src.jar" value="${tomcat-dbcp.home}/tomcat-dbcp-src.jar"/>
-
   <!-- Embedded JARs & source JARs -->
   <property name="tomcat-embed-core.jar" value="${tomcat.embed}/tomcat-embed-core.jar"/>
   <property name="tomcat-embed-jasper.jar" value="${tomcat.embed}/tomcat-embed-jasper.jar"/>
@@ -557,9 +554,6 @@
         <exclude name="java/org/apache/**/parser/ParseException.java" />
         <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
         <exclude name="java/org/apache/**/parser/Token*.java" />
-        <!-- Exclude these else Gump runs validate on them -->
-        <exclude name="**/org/apache/tomcat/dbcp/**"/>
-        <exclude name="**/tomcat-deps/**"/>
         <!-- Exclude simple test files -->
         <exclude name="test/webapp/bug53257/**/*.txt"/>
         <exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
@@ -618,9 +612,6 @@
         <exclude name="nbproject/**"/>
         <exclude name="output/**"/>
         <exclude name="modules/**"/>
-        <!-- Exclude these else Gump runs validate on them -->
-        <exclude name="**/org/apache/tomcat/dbcp/**"/>
-        <exclude name="**/tomcat-deps/**"/>
       </fileset>
       <fileset dir="modules/jdbc-pool" >
         <patternset refid="text.files" />
@@ -697,7 +688,7 @@
 
   </target>
 
-  <target name="package" depends="compile,build-tomcat-dbcp" >
+  <target name="package" depends="compile,build-manifests" >
     <!-- Common Annotations 1.0 JAR File -->
     <jarIt jarfile="${annotations-api.jar}"
       filesDir="${tomcat.classes}"
@@ -811,6 +802,11 @@
       filesDir="${tomcat.classes}"
       filesId="files.jasper-el" />
 
+    <!-- Re-packaged Apache Commons DBCP-->
+    <jarIt jarfile="${tomcat-dbcp.jar}"
+      filesDir="${tomcat.classes}"
+      filesId="files.tomcat-dbcp" />
+
     <!-- i18n JARs -->
     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
       manifest="${tomcat.manifests}/default.manifest">
@@ -1072,8 +1068,6 @@
     <!-- Add sources for examples -->
     <antcall target="examples-sources" />
 
-    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-      failonerror="false"/>
     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
   </target>
 
@@ -1224,7 +1218,7 @@
 
   <target name="embed-sources"
           description="Create source jars for embedded jars"
-          depends="build-manifests" >
+          depends="build-manifests,package-src-jar" >
 
     <mkdir dir="${tomcat.embed.sources}" />
 
@@ -2084,7 +2078,7 @@ Apache Tomcat ${version} native binaries
   </target>
 
   <target name="release"
-    depends="clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
+    depends="clean,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
     description="Create a Tomcat packaged distribution">
 
     <copy file="KEYS"
@@ -2574,18 +2568,16 @@ Apache Tomcat ${version} native binaries
       filesId="files.jasper-el" />
 
     <!-- Repackaged DBCP -->
-    <copy file="${tomcat-dbcp-src.jar}" todir="${tomcat.src.jars}" />
+    <jarIt jarfile="${tomcat-dbcp-src.jar}"
+      filesDir="java"
+      filesId="files.tomcat-dbcp" />
+
     <!-- jdbc-pool JAR File -->
     <copy file="${tomcat-jdbc-src.jar}" todir="${tomcat.src.jars}" />
   </target>
 
   <!-- ========================= Cleaning Targets ========================== -->
 
-  <target name="clean-depend"
-          description="Deletes the dependencies that are built from source">
-    <delete dir="${tomcat-dbcp.home}"/>
-  </target>
-
   <target name="clean"
           description="Delete the default output folders">
     <delete dir="${tomcat.output}" />
@@ -2637,29 +2629,6 @@ Apache Tomcat ${version} native binaries
       <param name="destdir" value="${commons-daemon.home}"/>
     </antcall>
 
-    <!-- Download src and build Tomcat DBCP bundle -->
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
-      <param name="destfile" value="${commons-pool.home}/build.xml" />
-    </antcall>
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
-      <param name="destfile" value="${commons-dbcp.home}/build.xml" />
-    </antcall>
-    <mkdir dir="${tomcat-dbcp.home}"/>
-    <!-- Rebuild dbcp only if built jars do not exist -->
-    <!-- or new versions of pool or dbcp have been downloaded. -->
-    <condition property="no.build.dbcp">
-      <and>
-        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
-        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
-        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
-        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
-      </and>
-    </condition>
-
     <!-- Download JDT (Eclipse compiler) -->
     <antcall target="downloadfile-2">
       <param name="sourcefile.1" value="${jdt.loc.1}"/>
@@ -2750,87 +2719,6 @@ Apache Tomcat ${version} native binaries
 
   </target>
 
-
-  <!-- =============== Targets for dependencies that need to =============== -->
-  <!-- ================  be built rather than used directly ================ -->
-
-  <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
-    <copy todir="${tomcat-dbcp.home}/src">
-      <fileset dir="${commons-pool.home}/src/main">
-        <include name="**/*.java" />
-        <exclude name="**/test/**" />
-        <exclude name="**/proxy/**" />
-      </fileset>
-    </copy>
-    <copy todir="${tomcat-dbcp.home}/src">
-      <fileset dir="${commons-dbcp.home}/src/main">
-        <include name="**/*.java" />
-        <exclude name="**/test/**" />
-        <exclude name="**/managed/**" />
-      </fileset>
-    </copy>
-    <copy todir="${tomcat-dbcp.home}/src/java">
-      <fileset dir="${commons-dbcp.home}/src/main/resources">
-        <include name="**/*.properties" />
-      </fileset>
-    </copy>
-
-    <!-- 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>
-
-   <!-- Depend on JULI rather than Commons-Logging -->
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
-        encoding="ISO-8859-1">
-      <replacefilter token="org.apache.tomcat.dbcp.logging"
-            value="org.apache.juli.logging" />
-    </replace>
-
-    <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
-    <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
-      <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
-    </move>
-    <mkdir dir="${tomcat-dbcp.home}/classes"/>
-    <!-- Make sure the build fails if the DBCP sources haven't been copied -->
-    <!-- correctly. Other problems should be detected by the following     -->
-    <!-- compilation step failing.                                         -->
-    <fail message="Repackaged DBCP factory is missing">
-      <condition>
-        <not>
-          <resourceexists>
-            <file file="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java"/>
-          </resourceexists>
-        </not>
-      </condition>
-    </fail>
-    <javac destdir="${tomcat-dbcp.home}/classes"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           target="${compile.target}"
-           sourcepath="${tomcat-dbcp.home}/src/java"
-           srcdir="${tomcat-dbcp.home}/src/java"
-           encoding="ISO-8859-1"
-           includeantruntime="false">
-      <include name="**" />
-      <classpath path="${tomcat.classes}" />
-    </javac>
-    <copy todir="${tomcat-dbcp.home}/classes">
-      <fileset dir="${tomcat-dbcp.home}/src/java">
-        <include name="**/*.properties" />
-      </fileset>
-    </copy>
-    <jarIt jarfile="${tomcat-dbcp.jar}"
-      filesDir="${tomcat-dbcp.home}/classes"
-      filesId="files.tomcat-dbcp" />
-    <jarIt jarfile="${tomcat-dbcp-src.jar}"
-      filesDir="${tomcat-dbcp.home}/src/java"
-      filesId="files.tomcat-dbcp" />
-  </target>
-
   <!-- =============== Utility Targets to support downloads ================ -->
 
   <target name="proxyflags">

Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/
------------------------------------------------------------------------------
    bugtraq:append = false

Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/
------------------------------------------------------------------------------
    bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Fri May  9 15:25:43 2014
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/
------------------------------------------------------------------------------
    bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.pool2.TrackedUse;
+import org.apache.tomcat.dbcp.pool2.TrackedUse;
 
 /**
  * Tracks db connection usage for recovering and reporting

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -45,14 +45,14 @@ import javax.management.NotCompliantMBea
 import javax.management.ObjectName;
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.AbandonedConfig;
-import org.apache.commons.pool2.impl.BaseObjectPoolConfig;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.impl.AbandonedConfig;
+import org.apache.tomcat.dbcp.pool2.impl.BaseObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPoolConfig;
 
 /**
  * <p>Basic implementation of <code>javax.sql.DataSource</code> that is
@@ -1705,7 +1705,7 @@ public class BasicDataSource implements 
     }
 
     /**
-     * If the connection pool implements {@link org.apache.commons.pool2.UsageTracking UsageTracking}, should the
+     * If the connection pool implements {@link org.apache.tomcat.dbcp.pool2.UsageTracking UsageTracking}, should the
      * connection pool record a stack trace every time a method is called on a
      * pooled connection and retain the most recent stack trace to aid debugging
      * of abandoned connections?
@@ -1721,7 +1721,7 @@ public class BasicDataSource implements 
     }
 
     /**
-     * If the connection pool implements {@link org.apache.commons.pool2.UsageTracking UsageTracking}, configure
+     * If the connection pool implements {@link org.apache.tomcat.dbcp.pool2.UsageTracking UsageTracking}, configure
      * whether the connection pool should record a stack trace every time a
      * method is called on a pooled connection and retain the most recent stack
      * trace to aid debugging of abandoned connections.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
@@ -52,53 +52,53 @@ import javax.naming.spi.ObjectFactory;
  */
 public class BasicDataSourceFactory implements ObjectFactory {
 
-    private final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
-    private final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
-    private final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";
-    private final static String PROP_DEFAULTCATALOG = "defaultCatalog";
-    private final static String PROP_CACHESTATE ="cacheState";
-    private final static String PROP_DRIVERCLASSNAME = "driverClassName";
-    private final static String PROP_LIFO = "lifo";
-    private final static String PROP_MAXTOTAL = "maxTotal";
-    private final static String PROP_MAXIDLE = "maxIdle";
-    private final static String PROP_MINIDLE = "minIdle";
-    private final static String PROP_INITIALSIZE = "initialSize";
-    private final static String PROP_MAXWAITMILLIS = "maxWaitMillis";
-    private final static String PROP_TESTONCREATE = "testOnCreate";
-    private final static String PROP_TESTONBORROW = "testOnBorrow";
-    private final static String PROP_TESTONRETURN = "testOnReturn";
-    private final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";
-    private final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";
-    private final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";
-    private final static String PROP_SOFTMINEVICTABLEIDLETIMEMILLIS = "softMinEvictableIdleTimeMillis";
-    private final static String PROP_EVICTIONPOLICYCLASSNAME = "evictionPolicyClassName";
-    private final static String PROP_TESTWHILEIDLE = "testWhileIdle";
-    private final static String PROP_PASSWORD = "password";
-    private final static String PROP_URL = "url";
-    private final static String PROP_USERNAME = "username";
-    private final static String PROP_VALIDATIONQUERY = "validationQuery";
-    private final static String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout";
-    private final static String PROP_JMX_NAME = "jmxName";
+    private static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+    private static final String PROP_DEFAULTREADONLY = "defaultReadOnly";
+    private static final String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";
+    private static final String PROP_DEFAULTCATALOG = "defaultCatalog";
+    private static final String PROP_CACHESTATE ="cacheState";
+    private static final String PROP_DRIVERCLASSNAME = "driverClassName";
+    private static final String PROP_LIFO = "lifo";
+    private static final String PROP_MAXTOTAL = "maxTotal";
+    private static final String PROP_MAXIDLE = "maxIdle";
+    private static final String PROP_MINIDLE = "minIdle";
+    private static final String PROP_INITIALSIZE = "initialSize";
+    private static final String PROP_MAXWAITMILLIS = "maxWaitMillis";
+    private static final String PROP_TESTONCREATE = "testOnCreate";
+    private static final String PROP_TESTONBORROW = "testOnBorrow";
+    private static final String PROP_TESTONRETURN = "testOnReturn";
+    private static final String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";
+    private static final String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";
+    private static final String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";
+    private static final String PROP_SOFTMINEVICTABLEIDLETIMEMILLIS = "softMinEvictableIdleTimeMillis";
+    private static final String PROP_EVICTIONPOLICYCLASSNAME = "evictionPolicyClassName";
+    private static final String PROP_TESTWHILEIDLE = "testWhileIdle";
+    private static final String PROP_PASSWORD = "password";
+    private static final String PROP_URL = "url";
+    private static final String PROP_USERNAME = "username";
+    private static final String PROP_VALIDATIONQUERY = "validationQuery";
+    private static final String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout";
+    private static final String PROP_JMX_NAME = "jmxName";
 
     /**
      * The property name for connectionInitSqls.
      * The associated value String must be of the form [query;]*
      */
-    private final static String PROP_CONNECTIONINITSQLS = "connectionInitSqls";
-    private final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";
-    private final static String PROP_REMOVEABANDONEDONBORROW = "removeAbandonedOnBorrow";
-    private final static String PROP_REMOVEABANDONEDONMAINTENANCE = "removeAbandonedOnMaintenance";
-    private final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";
-    private final static String PROP_LOGABANDONED = "logAbandoned";
-    private final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";
-    private final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";
-    private final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";
-    private final static String PROP_MAXCONNLIFETIMEMILLIS = "maxConnLifetimeMillis";
-    private final static String PROP_ROLLBACK_ON_RETURN = "rollbackOnReturn";
-    private final static String PROP_ENABLE_AUTOCOMMIT_ON_RETURN = "enableAutoCommitOnReturn";
-    private final static String PROP_DEFAULT_QUERYTIMEOUT = "defaultQueryTimeout";
+    private static final String PROP_CONNECTIONINITSQLS = "connectionInitSqls";
+    private static final String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";
+    private static final String PROP_REMOVEABANDONEDONBORROW = "removeAbandonedOnBorrow";
+    private static final String PROP_REMOVEABANDONEDONMAINTENANCE = "removeAbandonedOnMaintenance";
+    private static final String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";
+    private static final String PROP_LOGABANDONED = "logAbandoned";
+    private static final String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";
+    private static final String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";
+    private static final String PROP_CONNECTIONPROPERTIES = "connectionProperties";
+    private static final String PROP_MAXCONNLIFETIMEMILLIS = "maxConnLifetimeMillis";
+    private static final String PROP_ROLLBACK_ON_RETURN = "rollbackOnReturn";
+    private static final String PROP_ENABLE_AUTOCOMMIT_ON_RETURN = "enableAutoCommitOnReturn";
+    private static final String PROP_DEFAULT_QUERYTIMEOUT = "defaultQueryTimeout";
 
-    private final static String[] ALL_PROPERTIES = {
+    private static final String[] ALL_PROPERTIES = {
         PROP_DEFAULTAUTOCOMMIT,
         PROP_DEFAULTREADONLY,
         PROP_DEFAULTTRANSACTIONISOLATION,
@@ -450,7 +450,7 @@ public class BasicDataSourceFactory impl
      * @return Properties
      * @throws Exception
      */
-    static private Properties getProperties(String propText) throws Exception {
+    private static Properties getProperties(String propText) throws Exception {
       Properties p = new Properties();
       if (propText != null) {
         p.load(new ByteArrayInputStream(

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 /**
  * Defines the methods that will be made available via JMX.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 /**
  * Constants for use with JMX

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java Fri May  9 15:25:43 2014
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+
 import javax.sql.DataSource;
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java Fri May  9 15:25:43 2014
@@ -15,26 +15,26 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
-import java.net.URL;
-import java.sql.CallableStatement;
+import java.io.InputStream;
+import java.io.Reader;
 import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Map;
-import java.sql.Ref;
+import java.net.URL;
+import java.sql.Array;
 import java.sql.Blob;
+import java.sql.CallableStatement;
 import java.sql.Clob;
-import java.sql.Array;
-import java.util.Calendar;
-import java.io.InputStream;
-import java.io.Reader;
-import java.sql.SQLException;
+import java.sql.Date;
 import java.sql.NClob;
+import java.sql.Ref;
 import java.sql.RowId;
+import java.sql.SQLException;
 import java.sql.SQLXML;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Map;
 
 /**
  * A base delegating implementation of {@link CallableStatement}.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java Fri May  9 15:25:43 2014
@@ -15,29 +15,29 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.sql.ResultSet;
 import java.sql.Array;
 import java.sql.Blob;
+import java.sql.CallableStatement;
 import java.sql.ClientInfoStatus;
 import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
 import java.sql.SQLXML;
 import java.sql.Savepoint;
+import java.sql.Statement;
 import java.sql.Struct;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java Fri May  9 15:25:43 2014
@@ -15,27 +15,27 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
+import java.io.InputStream;
+import java.io.Reader;
 import java.math.BigDecimal;
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
+import java.sql.NClob;
 import java.sql.PreparedStatement;
 import java.sql.Ref;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.RowId;
 import java.sql.SQLException;
+import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
-import java.io.InputStream;
-import java.io.Reader;
-import java.sql.NClob;
-import java.sql.RowId;
-import java.sql.SQLXML;
 
 /**
  * A base delegating implementation of {@link PreparedStatement}.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java Fri May  9 15:25:43 2014
@@ -15,29 +15,29 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
-import java.sql.ResultSet;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.io.InputStream;
-import java.sql.SQLWarning;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
 import java.io.Reader;
-import java.sql.Statement;
-import java.util.Map;
-import java.sql.Connection;
-import java.sql.Ref;
+import java.math.BigDecimal;
+import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
-import java.sql.Array;
-import java.util.Calendar;
+import java.sql.Connection;
+import java.sql.Date;
 import java.sql.NClob;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
 import java.sql.SQLXML;
+import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Map;
 
 /**
  * A base delegating implementation of {@link ResultSet}.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.SQLException;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java Fri May  9 15:25:43 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
-import org.apache.commons.dbcp2.PoolingConnection.StatementType;
+import org.apache.tomcat.dbcp.dbcp2.PoolingConnection.StatementType;
 
 /**
  * A key uniquely identifying {@link java.sql.PreparedStatement PreparedStatement}s.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.commons.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
 
 /**
  * A {@link DelegatingCallableStatement} that cooperates with

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.lang.management.ManagementFactory;
 import java.sql.Connection;
@@ -29,7 +29,7 @@ import javax.management.MBeanServer;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 
-import org.apache.commons.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
 
 /**
  * A delegating connection that, rather than closing the underlying

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java Fri May  9 15:25:43 2014
@@ -15,25 +15,25 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicLong;
 
 import javax.management.ObjectName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPoolConfig;
 
 /**
  * A {@link PooledObjectFactory} that creates
@@ -99,7 +99,7 @@ public class PoolableConnectionFactory
      * Sets the {@link ObjectPool} in which to pool {@link Connection}s.
      * @param pool the {@link ObjectPool} in which to pool those {@link Connection}s
      */
-    synchronized public void setPool(ObjectPool<PoolableConnection> pool) {
+    public synchronized void setPool(ObjectPool<PoolableConnection> pool) {
         if(null != _pool && pool != _pool) {
             try {
                 _pool.close();

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.SQLException;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java Fri May  9 15:25:43 2014
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.commons.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
 
 /**
  * A {@link DelegatingPreparedStatement} that cooperates with

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -23,10 +23,10 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.KeyedPooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedPooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
 
 /**
  * A {@link DelegatingConnection} that pools {@link PreparedStatement}s.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.io.PrintWriter;
 import java.sql.Connection;
@@ -25,10 +25,10 @@ import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool;
 
 /**
  * A simple {@link DataSource} implementation that obtains
@@ -46,7 +46,7 @@ import org.apache.commons.pool2.impl.Gen
 public class PoolingDataSource<C extends Connection> implements DataSource {
 
     private static final Log log = LogFactory.getLog(PoolingDataSource.class);
-    
+
     /** Controls access to the underlying connection */
     private boolean accessToUnderlyingConnectionAllowed = false;
 
@@ -202,7 +202,7 @@ public class PoolingDataSource<C extends
         }
 
         /**
-         * @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
+         * @see org.apache.tomcat.dbcp.dbcp2.DelegatingConnection#getDelegate()
          */
         @Override
         public D getDelegate() {
@@ -213,7 +213,7 @@ public class PoolingDataSource<C extends
         }
 
         /**
-         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.tomcat.dbcp.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         @Override
         public Connection getInnermostDelegate() {

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.Driver;
@@ -28,7 +28,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.apache.commons.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
 
 
 /**
@@ -217,7 +217,7 @@ public class PoolingDriver implements Dr
         }
 
         /**
-         * @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
+         * @see org.apache.tomcat.dbcp.dbcp2.DelegatingConnection#getDelegate()
          */
         @Override
         public Connection getDelegate() {
@@ -228,7 +228,7 @@ public class PoolingDriver implements Dr
         }
 
         /**
-         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.tomcat.dbcp.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         @Override
         public Connection getInnermostDelegate() {

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java Fri May  9 15:25:43 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.pool2.SwallowedExceptionListener;
+import org.apache.juli.logging.Log;
+import org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener;
 
 /**
  * Class for logging swallowed exceptions

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java Fri May  9 15:25:43 2014
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java Fri May  9 15:25:43 2014
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.cpdsadapter;
+package org.apache.tomcat.dbcp.dbcp2.cpdsadapter;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.apache.commons.dbcp2.DelegatingConnection;
-import org.apache.commons.dbcp2.DelegatingPreparedStatement;
+import org.apache.tomcat.dbcp.dbcp2.DelegatingConnection;
+import org.apache.tomcat.dbcp.dbcp2.DelegatingPreparedStatement;
 
 /**
  * This class is the <code>Connection</code> that will be returned

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.cpdsadapter;
+package org.apache.tomcat.dbcp.dbcp2.cpdsadapter;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -37,11 +37,11 @@ import javax.naming.spi.ObjectFactory;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.commons.dbcp2.PoolablePreparedStatement;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.impl.BaseObjectPoolConfig;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.tomcat.dbcp.dbcp2.PoolablePreparedStatement;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.BaseObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPoolConfig;
 
 /**
  * <p>
@@ -51,7 +51,7 @@ import org.apache.commons.pool2.impl.Gen
  * <code>ConnectionPoolDataSource</code>s are not used within general
  * applications.  They are used by <code>DataSource</code> implementations
  * that pool <code>Connection</code>s, such as
- * {@link org.apache.commons.dbcp2.datasources.SharedPoolDataSource}.  A J2EE
+ * {@link org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolDataSource}.  A J2EE
  * container will normally provide some method of initializing the
  * <code>ConnectionPoolDataSource</code> whose attributes are presented
  * as bean getters/setters and then deploying it via JNDI.  It is then
@@ -212,7 +212,7 @@ public class DriverAdapterCPDS
             {
                 // since there is limit, create a prepared statement pool without an eviction thread
                 //  pool has LRU functionality so when the limit is reached, 15% of the pool is cleared.
-                // see org.apache.commons.pool2.impl.GenericKeyedObjectPool.clearOldest method
+                // see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool.clearOldest method
                 config.setMaxTotal(getMaxPreparedStatements());
                 config.setTimeBetweenEvictionRunsMillis(-1);
                 config.setNumTestsPerEvictionRun(0);

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java Fri May  9 15:25:43 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2.cpdsadapter;
+package org.apache.tomcat.dbcp.dbcp2.cpdsadapter;
 
 import java.util.Arrays;
 
-import org.apache.commons.dbcp2.PStmtKey;
+import org.apache.tomcat.dbcp.dbcp2.PStmtKey;
 
 /**
  * A key uniquely identifying a {@link java.sql.PreparedStatement PreparedStatement}.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.cpdsadapter;
+package org.apache.tomcat.dbcp.dbcp2.cpdsadapter;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -27,12 +27,12 @@ import javax.sql.ConnectionEventListener
 import javax.sql.PooledConnection;
 import javax.sql.StatementEventListener;
 
-import org.apache.commons.dbcp2.DelegatingConnection;
-import org.apache.commons.dbcp2.PoolablePreparedStatement;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.KeyedPooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.tomcat.dbcp.dbcp2.DelegatingConnection;
+import org.apache.tomcat.dbcp.dbcp2.PoolablePreparedStatement;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedPooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
 
 /**
  * Implementation of PooledConnection that is returned by

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java Fri May  9 15:25:43 2014
@@ -29,11 +29,11 @@
  *
  * <pre>
  *  &lt;Resource name="jdbc/bookstoreCPDS" auth="Container"
- *             type="org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS"/&gt;
+ *             type="org.apache.tomcat.dbcp.dbcp2.cpdsadapter.DriverAdapterCPDS"/&gt;
  *   &lt;ResourceParams name="jdbc/bookstoreCPDS"&gt;
  *     &lt;parameter&gt;
  *       &lt;name&gt;factory&lt;/name&gt;
- *       &lt;value&gt;org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS&lt;/value&gt;
+ *       &lt;value&gt;org.apache.tomcat.dbcp.dbcp2.cpdsadapter.DriverAdapterCPDS&lt;/value&gt;
  *     &lt;/parameter&gt;
  *         &lt;parameter&gt;&lt;name&gt;user&lt;/name&gt;&lt;value&gt;root&lt;/value&gt;&lt;/parameter&gt;
  *         &lt;parameter&gt;&lt;name&gt;password&lt;/name&gt;&lt;value&gt;&lt;/value&gt;&lt;/parameter&gt;
@@ -63,7 +63,7 @@
  *     jdbc/bookstoreCPDS
  *   &lt;/res-ref-name&gt;
  *   &lt;res-type&gt;
- *     org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS
+ *     org.apache.tomcat.dbcp.dbcp2.cpdsadapter.DriverAdapterCPDS
  *   &lt;/res-type&gt;
  *   &lt;res-auth&gt;
  *     Container
@@ -76,4 +76,4 @@
  * <strong>java:comp/env</strong> namespace.
  * </p>
  */
-package org.apache.commons.dbcp2.cpdsadapter;
+package org.apache.tomcat.dbcp.dbcp2.cpdsadapter;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -30,15 +30,15 @@ import javax.sql.ConnectionEventListener
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.commons.dbcp2.Utils;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.tomcat.dbcp.dbcp2.Utils;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
 
 /**
  * A {@link PooledObjectFactory} that creates
- * {@link org.apache.commons.dbcp2.PoolableConnection PoolableConnection}s.
+ * {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnection PoolableConnection}s.
  *
  * @author John D. McNally
  * @version $Revision$ $Date$

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -35,8 +35,8 @@ import javax.sql.ConnectionPoolDataSourc
 import javax.sql.DataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.commons.pool2.impl.BaseObjectPoolConfig;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.impl.BaseObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPoolConfig;
 
 /**
  * <p>The base class for <code>SharedPoolDataSource</code> and
@@ -68,7 +68,7 @@ import org.apache.commons.pool2.impl.Gen
  *
  * <p>
  * The dbcp package contains an adapter,
- * {@link org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS},
+ * {@link org.apache.tomcat.dbcp.dbcp2.cpdsadapter.DriverAdapterCPDS},
  * that can be used to allow the use of <code>DataSource</code>'s based on this
  * class with jdbc driver implementations that do not supply a
  * <code>ConnectionPoolDataSource</code>, but still
@@ -394,7 +394,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each
      * per user pool.
      */
     public long getDefaultSoftMinEvictableIdleTimeMillis() {
@@ -403,7 +403,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each per user pool.
      */
     public void setDefaultSoftMinEvictableIdleTimeMillis(
             long softMinEvictableIdleTimeMillis) {
@@ -414,7 +414,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnCreate()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnCreate()} for each per user pool.
      */
     public boolean getDefaultTestOnCreate() {
         return this.defaultTestOnCreate;
@@ -422,7 +422,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnCreate()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnCreate()} for each per user pool.
      */
     public void setDefaultTestOnCreate(boolean testOnCreate) {
         assertInitializationAllowed();
@@ -432,7 +432,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnBorrow()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnBorrow()} for each per user pool.
      */
     public boolean getDefaultTestOnBorrow() {
         return this.defaultTestOnBorrow;
@@ -440,7 +440,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnBorrow()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnBorrow()} for each per user pool.
      */
     public void setDefaultTestOnBorrow(boolean testOnBorrow) {
         assertInitializationAllowed();
@@ -450,7 +450,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnReturn()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnReturn()} for each per user pool.
      */
     public boolean getDefaultTestOnReturn() {
         return this.defaultTestOnReturn;
@@ -458,7 +458,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnReturn()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnReturn()} for each per user pool.
      */
     public void setDefaultTestOnReturn(boolean testOnReturn) {
         assertInitializationAllowed();
@@ -468,7 +468,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestWhileIdle()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestWhileIdle()} for each per user pool.
      */
     public boolean getDefaultTestWhileIdle() {
         return this.defaultTestWhileIdle;
@@ -476,7 +476,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestWhileIdle()} for each per user pool.
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTestWhileIdle()} for each per user pool.
      */
     public void setDefaultTestWhileIdle(boolean testWhileIdle) {
         assertInitializationAllowed();
@@ -486,7 +486,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Gets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each
      * per user pool.
      */
     public long getDefaultTimeBetweenEvictionRunsMillis () {
@@ -495,7 +495,7 @@ public abstract class InstanceKeyDataSou
 
     /**
      * Sets the default value for
-     * {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each
+     * {@link org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each
      * per user pool.
      */
     public void setDefaultTimeBetweenEvictionRunsMillis (

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java Fri May  9 15:25:43 2014
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
 import java.util.Hashtable;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
@@ -45,7 +45,7 @@ abstract class InstanceKeyDataSourceFact
     private static final Map<String, InstanceKeyDataSource> instanceMap =
             new ConcurrentHashMap<>();
 
-    synchronized static String registerNewInstance(InstanceKeyDataSource ds) {
+    static synchronized String registerNewInstance(InstanceKeyDataSource ds) {
         int max = 0;
         Iterator<String> i = instanceMap.keySet().iterator();
         while (i.hasNext()) {

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -31,11 +31,11 @@ import javax.sql.ConnectionEventListener
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.commons.dbcp2.Utils;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.KeyedPooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.tomcat.dbcp.dbcp2.Utils;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedPooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject;
 
 /**
  * A {*link PoolableObjectFactory} that creates
@@ -113,7 +113,7 @@ class KeyedCPDSConnectionFactory
      *
      * @param upkey {@link UserPassKey} containing user credentials
      * @throws SQLException if the connection could not be created.
-     * @see org.apache.commons.pool2.KeyedPooledObjectFactory#makeObject(java.lang.Object)
+     * @see org.apache.tomcat.dbcp.pool2.KeyedPooledObjectFactory#makeObject(java.lang.Object)
      */
     @Override
     public synchronized PooledObject<PooledConnectionAndInfo> makeObject(UserPassKey upkey)

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java Fri May  9 15:25:43 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -29,11 +29,11 @@ import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.sql.ConnectionPoolDataSource;
 
-import org.apache.commons.dbcp2.SwallowedExceptionLogger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.dbcp.dbcp2.SwallowedExceptionLogger;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericObjectPool;
 
 /**
  * <p>A pooling <code>DataSource</code> appropriate for deployment within

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.IOException;
 import java.util.Map;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.Serializable;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import javax.sql.PooledConnection;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java Fri May  9 15:25:43 2014
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.sql.SQLException;
+
 import javax.sql.PooledConnection;
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,9 +27,9 @@ import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.sql.ConnectionPoolDataSource;
 
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPoolConfig;
 
 /**
  * <p>A pooling <code>DataSource</code> appropriate for deployment within

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import javax.naming.RefAddr;
 import javax.naming.Reference;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java Fri May  9 15:25:43 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;
 
 import java.io.Serializable;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java Fri May  9 15:25:43 2014
@@ -38,11 +38,11 @@
  *
  * <code><pre>
  *  &lt;Resource name="jdbc/bookstore" auth="Container"
- *             type="org.apache.commons.dbcp2.datasources.PerUserPoolPoolDataSource"/&gt;
+ *             type="org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolPoolDataSource"/&gt;
  *   &lt;ResourceParams name="jdbc/bookstore"&gt;
  *     &lt;parameter&gt;
  *       &lt;name&gt;factory&lt;/name&gt;
- *       &lt;value&gt;org.apache.commons.dbcp2.datasources.PerUserPoolDataSourceFactory&lt;/value&gt;
+ *       &lt;value&gt;org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSourceFactory&lt;/value&gt;
  *     &lt;/parameter&gt;
  *     &lt;parameter&gt;
  *       &lt;name&gt;dataSourceName&lt;/name&gt;&lt;value&gt;java:comp/env/jdbc/bookstoreCPDS&lt;/value&gt;
@@ -69,7 +69,7 @@
  *     jdbc/bookstore
  *   &lt;/res-ref-name&gt;
  *   &lt;res-type&gt;
- *     org.apache.commons.dbcp2.datasources.PerUserPoolDataSource
+ *     org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource
  *   &lt;/res-type&gt;
  *   &lt;res-auth&gt;
  *     Container
@@ -180,4 +180,4 @@
  *     }
  * </pre></code>
  */
-package org.apache.commons.dbcp2.datasources;
+package org.apache.tomcat.dbcp.dbcp2.datasources;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org