tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1593563 [2/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 GMT
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=1593563&r1=1593515&r2=1593563&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 Fri May  9 15:25:43 2014
@@ -26,48 +26,48 @@
  * </p><p>
  *    A: There are two primary ways to access the DBCP pool, as a
  *    {@link java.sql.Driver Driver}, or as a {@link javax.sql.DataSource DataSource}.
- *    You'll want to create an instance of {@link org.apache.commons.dbcp2.PoolingDriver} or
- *    {@link org.apache.commons.dbcp2.PoolingDataSource}.  When using one of these
+ *    You'll want to create an instance of {@link org.apache.tomcat.dbcp.dbcp2.PoolingDriver} or
+ *    {@link org.apache.tomcat.dbcp.dbcp2.PoolingDataSource}.  When using one of these
  *    interfaces, you can just use your JDBC objects the way you normally would.
  *    Closing a {@link java.sql.Connection} will simply return it to its pool.
  * </p>
  * <p>
- *    Q: But {@link org.apache.commons.dbcp2.PoolingDriver PoolingDriver} and
- *    {@link org.apache.commons.dbcp2.PoolingDataSource PoolingDataSource} both expect an
- *    {@link org.apache.commons.pool2.ObjectPool ObjectPool} as an input.  Where do I
+ *    Q: But {@link org.apache.tomcat.dbcp.dbcp2.PoolingDriver PoolingDriver} and
+ *    {@link org.apache.tomcat.dbcp.dbcp2.PoolingDataSource PoolingDataSource} both expect an
+ *    {@link org.apache.tomcat.dbcp.pool2.ObjectPool ObjectPool} as an input.  Where do I
  *    get one of those?
  * </p><p>
- *    A: The {@link org.apache.commons.pool2.ObjectPool ObjectPool} interface is defined
+ *    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.commons.pool2.impl.GenericObjectPool GenericObjectPool},
- *    {@link org.apache.commons.pool2.proxy.ProxiedObjectPool ProxiedObjectPool} or
- *    {@link org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool}
+ *    {@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.SoftReferenceObjectPool SoftReferenceObjectPool}
  *    or you can create your own.
  * </p>
  * <p>
- *    Q: Ok, I've found an {@link org.apache.commons.pool2.ObjectPool ObjectPool}
+ *    Q: Ok, I've found an {@link org.apache.tomcat.dbcp.pool2.ObjectPool ObjectPool}
  *    implementation that I think suits my connection pooling needs.  But it wants
- *    a {@link org.apache.commons.pool2.PooledObjectFactory PooledObjectFactory}.
+ *    a {@link org.apache.tomcat.dbcp.pool2.PooledObjectFactory PooledObjectFactory}.
  *    What should I use for that?
  * </p><p>
  *    A: The DBCP package provides a class for this purpose. It's called
- *    {@link org.apache.commons.dbcp2.PoolableConnectionFactory}.
+ *    {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory}.
  *    It implements the factory and lifecycle methods of
- *    {@link org.apache.commons.pool2.PooledObjectFactory}
+ *    {@link org.apache.tomcat.dbcp.pool2.PooledObjectFactory}
  *    for {@link java.sql.Connection}s.  But it doesn't create the actual database
  *    {@link java.sql.Connection}s itself, it uses a
- *    {@link org.apache.commons.dbcp2.ConnectionFactory} for that.
- *    The {@link org.apache.commons.dbcp2.PoolableConnectionFactory} will take
- *    {@link java.sql.Connection}s created by the {@link org.apache.commons.dbcp2.ConnectionFactory}
+ *    {@link org.apache.tomcat.dbcp.dbcp2.ConnectionFactory} for that.
+ *    The {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory} will take
+ *    {@link java.sql.Connection}s created by the {@link org.apache.tomcat.dbcp.dbcp2.ConnectionFactory}
  *    and wrap them with classes that implement the pooling behaviour.
  * </p><p>
- *    Several implementations of {@link org.apache.commons.dbcp2.ConnectionFactory} are
+ *    Several implementations of {@link org.apache.tomcat.dbcp.dbcp2.ConnectionFactory} are
  *    provided--one that uses {@link java.sql.DriverManager} to create connections
- *    ({@link org.apache.commons.dbcp2.DriverManagerConnectionFactory}),
+ *    ({@link org.apache.tomcat.dbcp.dbcp2.DriverManagerConnectionFactory}),
  *    one that uses a {@link java.sql.Driver} to create connections
- *    ({@link org.apache.commons.dbcp2.DriverConnectionFactory}),
+ *    ({@link org.apache.tomcat.dbcp.dbcp2.DriverConnectionFactory}),
  *    one that uses a {@link javax.sql.DataSource} to create connections
- *    ({@link org.apache.commons.dbcp2.DataSourceConnectionFactory}).
+ *    ({@link org.apache.tomcat.dbcp.dbcp2.DataSourceConnectionFactory}).
  * </p>
  * <p>
  *    Q: I think I'm starting to get it, but can you walk me though it again?
@@ -76,31 +76,31 @@
  *    that pools {@link java.sql.Connection}s.  Let's also assume that
  *    those pooled {@link java.sql.Connection}s should be obtained from
  *    the {@link java.sql.DriverManager}.
- *    You'll want to create a {@link org.apache.commons.dbcp2.PoolingDataSource}.
+ *    You'll want to create a {@link org.apache.tomcat.dbcp.dbcp2.PoolingDataSource}.
  * </p><p>
- *    The {@link org.apache.commons.dbcp2.PoolingDataSource} uses an underlying
- *    {@link org.apache.commons.pool2.ObjectPool} to create and store its
+ *    The {@link org.apache.tomcat.dbcp.dbcp2.PoolingDataSource} uses an underlying
+ *    {@link org.apache.tomcat.dbcp.pool2.ObjectPool} to create and store its
  *    {@link java.sql.Connection}.
  * </p><p>
- *    To create a {@link org.apache.commons.pool2.ObjectPool}, you'll need
- *    a {@link org.apache.commons.pool2.PooledObjectFactory} that creates
+ *    To create a {@link org.apache.tomcat.dbcp.pool2.ObjectPool}, you'll need
+ *    a {@link org.apache.tomcat.dbcp.pool2.PooledObjectFactory} that creates
  *    the actual {@link java.sql.Connection}s.  That's what
- *    {@link org.apache.commons.dbcp2.PoolableConnectionFactory} is for.
+ *    {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory} is for.
  * </p><p>
- *    To create the {@link org.apache.commons.dbcp2.PoolableConnectionFactory},
+ *    To create the {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory},
  *    you'll need at least two things:
  *    <ol>
  *     <li>
- * A {@link org.apache.commons.dbcp2.ConnectionFactory} from which
+ * A {@link org.apache.tomcat.dbcp.dbcp2.ConnectionFactory} from which
  * the actual database {@link java.sql.Connection}s will be obtained.
  *     </li>
  *     <li>
- * An empty and factory-less {@link org.apache.commons.pool2.ObjectPool}
+ * An empty and factory-less {@link org.apache.tomcat.dbcp.pool2.ObjectPool}
  * in which the {@link java.sql.Connection}s will be stored.
  * <br></br>
- * When you pass an {@link org.apache.commons.pool2.ObjectPool} into the
- * {@link org.apache.commons.dbcp2.PoolableConnectionFactory}, it will
- * automatically register itself as the {@link org.apache.commons.pool2.PooledObjectFactory}
+ * When you pass an {@link org.apache.tomcat.dbcp.pool2.ObjectPool} into the
+ * {@link org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory}, it will
+ * automatically register itself as the {@link org.apache.tomcat.dbcp.pool2.PooledObjectFactory}
  * for that pool.
  *     </li>
  *    </ol>
@@ -111,9 +111,9 @@
  * PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory,connectionPool,null,null,false,true);
  * PoolingDataSource dataSource = new PoolingDataSource(connectionPool);</pre>
  * </p><p>
- *    To create a {@link org.apache.commons.dbcp2.PoolingDriver}, we do the same thing,
+ *    To create a {@link org.apache.tomcat.dbcp.dbcp2.PoolingDriver}, we do the same thing,
  *    except that instead of creating a {@link javax.sql.DataSource} on the last line,
- *    we create a {@link org.apache.commons.dbcp2.PoolingDriver}, and register the
+ *    we create a {@link org.apache.tomcat.dbcp.dbcp2.PoolingDriver}, and register the
  *    <tt>connectionPool</tt> with it.  E.g.,:
  * <pre>GenericObjectPool connectionPool = new GenericObjectPool(null);
  * ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string", "username", "password");
@@ -121,11 +121,11 @@
  * PoolingDriver driver = new PoolingDriver();
  * driver.registerPool("example",connectionPool);</pre>
  * </p><p>
- *    Since the {@link org.apache.commons.dbcp2.PoolingDriver} registers itself
+ *    Since the {@link org.apache.tomcat.dbcp.dbcp2.PoolingDriver} registers itself
  *    with the {@link java.sql.DriverManager} when it is created, now you can just
  *    go to the {@link java.sql.DriverManager} to create your {@link java.sql.Connection}s,
  *    like you normally would:
  * <pre>Connection conn = DriverManager.getConnection("jdbc:apache:commons:dbcp:example");</pre>
  * </p>
  */
-package org.apache.commons.dbcp2;
+package org.apache.tomcat.dbcp.dbcp2;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * A base implementation of <code>KeyedPooledObjectFactory</code>.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * A simple base implementation of {@link ObjectPool}.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * A base implementation of <code>PoolableObjectFactory</code>.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 import java.util.NoSuchElementException;
 
@@ -48,7 +48,7 @@ import java.util.NoSuchElementException;
  * for each key (essentially creating a {@link java.util.Map Map} of
  * {@link ObjectPool pools}).
  * <p>
- * See {@link org.apache.commons.pool2.impl.GenericKeyedObjectPool
+ * See {@link org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool
  * GenericKeyedObjectPool} for an implementation.
  *
  * @param <K> The type of keys maintained by this pool.
@@ -56,7 +56,7 @@ import java.util.NoSuchElementException;
  *
  * @see KeyedPooledObjectFactory
  * @see ObjectPool
- * @see org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool
+ * @see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool
  *
  * @version $Revision$
  *

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * An interface defining life-cycle methods for

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 import java.util.NoSuchElementException;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java Fri May  9 15:25:43 2014
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.Collections;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -108,7 +108,7 @@ public final class PoolUtils {
         if (minIdle < 0) {
             throw new IllegalArgumentException("minIdle must be non-negative.");
         }
-        final TimerTask task = new ObjectPoolMinIdleTimerTask<T>(pool, minIdle);
+        final TimerTask task = new ObjectPoolMinIdleTimerTask<>(pool, minIdle);
         getMinIdleTimer().schedule(task, 0L, period);
         return task;
     }
@@ -152,7 +152,7 @@ public final class PoolUtils {
         if (minIdle < 0) {
             throw new IllegalArgumentException("minIdle must be non-negative.");
         }
-        final TimerTask task = new KeyedObjectPoolMinIdleTimerTask<K, V>(
+        final TimerTask task = new KeyedObjectPoolMinIdleTimerTask<>(
                 keyedPool, key, minIdle);
         getMinIdleTimer().schedule(task, 0L, period);
         return task;
@@ -192,7 +192,7 @@ public final class PoolUtils {
         if (keys == null) {
             throw new IllegalArgumentException("keys must not be null.");
         }
-        final Map<K, TimerTask> tasks = new HashMap<K, TimerTask>(keys.size());
+        final Map<K, TimerTask> tasks = new HashMap<>(keys.size());
         final Iterator<K> iter = keys.iterator();
         while (iter.hasNext()) {
             final K key = iter.next();
@@ -323,7 +323,7 @@ public final class PoolUtils {
          * .equals(pool.getClass().getName()) :
          * "CompositeObjectPools are already thread-safe";
          */
-        return new SynchronizedObjectPool<T>(pool);
+        return new SynchronizedObjectPool<>(pool);
     }
 
     /**
@@ -356,7 +356,7 @@ public final class PoolUtils {
          * .equals(keyedPool.getClass().getName()) :
          * "CompositeKeyedObjectPools are already thread-safe";
          */
-        return new SynchronizedKeyedObjectPool<K, V>(keyedPool);
+        return new SynchronizedKeyedObjectPool<>(keyedPool);
     }
 
     /**
@@ -371,7 +371,7 @@ public final class PoolUtils {
      */
     public static <T> PooledObjectFactory<T> synchronizedPooledFactory(
             final PooledObjectFactory<T> factory) {
-        return new SynchronizedPooledObjectFactory<T>(factory);
+        return new SynchronizedPooledObjectFactory<>(factory);
     }
 
     /**
@@ -387,7 +387,7 @@ public final class PoolUtils {
      */
     public static <K, V> KeyedPooledObjectFactory<K, V> synchronizedKeyedPooledFactory(
             final KeyedPooledObjectFactory<K, V> keyedFactory) {
-        return new SynchronizedKeyedPooledObjectFactory<K, V>(keyedFactory);
+        return new SynchronizedKeyedPooledObjectFactory<>(keyedFactory);
     }
 
     /**
@@ -443,7 +443,7 @@ public final class PoolUtils {
         if (factor <= 0f) {
             throw new IllegalArgumentException("factor must be positive.");
         }
-        return new ErodingObjectPool<T>(pool, factor);
+        return new ErodingObjectPool<>(pool, factor);
     }
 
     /**
@@ -546,9 +546,9 @@ public final class PoolUtils {
             throw new IllegalArgumentException("factor must be positive.");
         }
         if (perKey) {
-            return new ErodingPerKeyKeyedObjectPool<K, V>(keyedPool, factor);
+            return new ErodingPerKeyKeyedObjectPool<>(keyedPool, factor);
         }
-        return new ErodingKeyedObjectPool<K, V>(keyedPool, factor);
+        return new ErodingKeyedObjectPool<>(keyedPool, factor);
     }
 
     /**

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 import java.io.PrintWriter;
 import java.util.Deque;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * An interface defining life-cycle methods for instances to be served by an

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectState.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectState.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectState.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectState.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * Provides the possible states that a {@link PooledObject} may be in.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/SwallowedExceptionListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/SwallowedExceptionListener.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/SwallowedExceptionListener.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/SwallowedExceptionListener.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * Pools that unavoidably swallow exceptions may be configured with an instance

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/TrackedUse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/TrackedUse.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/TrackedUse.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/TrackedUse.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * This interface allows pooled objects to make information available about when

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/UsageTracking.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/UsageTracking.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/UsageTracking.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/UsageTracking.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.pool2;
+package org.apache.tomcat.dbcp.pool2;
 
 /**
  * This interface may be implemented by an object pool to enable clients

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java Fri May  9 15:25:43 2014
@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.commons.pool2.TrackedUse;
-import org.apache.commons.pool2.UsageTracking;
-
 /**
  * Configuration settings for abandoned object removal.
  *
@@ -110,7 +107,8 @@ public class AbandonedConfig {
      * <p>Timeout in seconds before an abandoned object can be removed.</p>
      *
      * <p>The time of most recent use of an object is the maximum (latest) of
-     * {@link TrackedUse#getLastUsed()} (if this class of the object implements
+     * {@link org.apache.tomcat.dbcp.pool2.TrackedUse#getLastUsed()}
+     * (if this class of the object implements
      * TrackedUse) and the time when the object was borrowed from the pool.</p>
      *
      * <p>The default value is 300 seconds.</p>
@@ -206,7 +204,9 @@ public class AbandonedConfig {
     private boolean useUsageTracking = false;
 
     /**
-     * If the pool implements {@link UsageTracking}, should the pool record a
+     * If the pool implements
+     * {@link org.apache.tomcat.dbcp.pool2.UsageTracking}, should the pool
+     * record a
      * stack trace every time a method is called on a pooled object and retain
      * the most recent stack trace to aid debugging of abandoned objects?
      *
@@ -217,7 +217,9 @@ public class AbandonedConfig {
     }
 
     /**
-     * If the pool implements {@link UsageTracking}, configure whether the pool
+     * If the pool implements
+     * {@link org.apache.tomcat.dbcp.pool2.UsageTracking}, configure whether the
+     * pool
      * should record a stack trace every time a method is called on a pooled
      * object and retain the most recent stack trace to aid debugging of
      * abandoned objects.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -32,8 +32,8 @@ import javax.management.MalformedObjectN
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.SwallowedExceptionListener;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener;
 
 /**
  * Base class that provides common functionality for {@link GenericObjectPool}

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 /**
  * Provides the implementation for the common attributes shared by the
@@ -144,7 +144,7 @@ public abstract class BaseObjectPoolConf
      * @see GenericKeyedObjectPool#getEvictionPolicyClassName()
      */
     public static final String DEFAULT_EVICTION_POLICY_CLASS_NAME =
-            "org.apache.commons.pool2.impl.DefaultEvictionPolicy";
+            "org.apache.tomcat.dbcp.pool2.impl.DefaultEvictionPolicy";
 
 
     private boolean lifo = DEFAULT_LIFO;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
-import org.apache.commons.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
 
 /**
  * Provides the default implementation of {@link EvictionPolicy} used by the

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java Fri May  9 15:25:43 2014
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Deque;
 
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectState;
-import org.apache.commons.pool2.TrackedUse;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObjectState;
+import org.apache.tomcat.dbcp.pool2.TrackedUse;
 
 /**
  * This wrapper is used to track the additional information, such as state, for

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java Fri May  9 15:25:43 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 
-import org.apache.commons.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
 
 /**
  * Implementation of object that is used to provide information on pooled

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 /**
  * The interface that defines the information about pooled objects that will be

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionConfig.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionConfig.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 /**
  * This class is used by pool implementations to pass configuration information

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionPolicy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionPolicy.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionPolicy.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionPolicy.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
-import org.apache.commons.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
 
 /**
  * To provide a custom eviction policy (i.e. something other than {@link
@@ -24,7 +24,7 @@ import org.apache.commons.pool2.PooledOb
  * this interface that provides the required eviction policy.
  *
  * @param <T> the type of objects in the pool
- *  
+ *
  * @version $Revision: $
  *
  * @since 2.0

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,12 +32,11 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.KeyedPooledObjectFactory;
-import org.apache.commons.pool2.PoolUtils;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectState;
-import org.apache.commons.pool2.SwallowedExceptionListener;
+import org.apache.tomcat.dbcp.pool2.KeyedObjectPool;
+import org.apache.tomcat.dbcp.pool2.KeyedPooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PoolUtils;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObjectState;
 
 /**
  * A configurable <code>KeyedObjectPool</code> implementation.
@@ -453,7 +452,8 @@ public class GenericKeyedObjectPool<K,T>
      * destroyed.
      * <p>
      * Exceptions encountered destroying objects for any reason are swallowed
-     * but notified via a {@link SwallowedExceptionListener}.
+     * but notified via a
+     * {@link org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener}.
      *
      * @param key pool key
      * @param obj instance to return to the keyed pool
@@ -596,7 +596,8 @@ public class GenericKeyedObjectPool<K,T>
      * idle instance pool, even during its execution. Additional instances may
      * be returned while removed items are being destroyed.</li>
      * <li>Exceptions encountered destroying idle instances are swallowed
-     * but notified via a {@link SwallowedExceptionListener}.</li>
+     * but notified via a
+     * {@link org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener}.</li>
      * </ul>
      */
     @Override
@@ -613,7 +614,7 @@ public class GenericKeyedObjectPool<K,T>
      * Clears the specified sub-pool, removing all pooled instances
      * corresponding to the given <code>key</code>. Exceptions encountered
      * destroying idle instances are swallowed but notified via a
-     * {@link SwallowedExceptionListener}.
+     * {@link org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener}.
      *
      * @param key the key to clear
      */
@@ -729,7 +730,7 @@ public class GenericKeyedObjectPool<K,T>
     public void clearOldest() {
 
         // build sorted map of idle objects
-        final Map<PooledObject<T>, K> map = new TreeMap<PooledObject<T>, K>();
+        final Map<PooledObject<T>, K> map = new TreeMap<>();
 
         for (K k : poolMap.keySet()) {
             ObjectDeque<T> queue = poolMap.get(k);
@@ -876,7 +877,7 @@ public class GenericKeyedObjectPool<K,T>
                 if(evictionIterator == null || !evictionIterator.hasNext()) {
                     if (evictionKeyIterator == null ||
                             !evictionKeyIterator.hasNext()) {
-                        List<K> keyCopy = new ArrayList<K>();
+                        List<K> keyCopy = new ArrayList<>();
                         Lock readLock = keyLock.readLock();
                         readLock.lock();
                         try {
@@ -1084,7 +1085,7 @@ public class GenericKeyedObjectPool<K,T>
                 lock.lock();
                 objectDeque = poolMap.get(k);
                 if (objectDeque == null) {
-                    objectDeque = new ObjectDeque<T>();
+                    objectDeque = new ObjectDeque<>();
                     objectDeque.getNumInterested().incrementAndGet();
                     // NOTE: Keys must always be added to both poolMap and
                     //       poolKeyList at the same time while protected by
@@ -1294,7 +1295,7 @@ public class GenericKeyedObjectPool<K,T>
 
     @Override
     public Map<String,Integer> getNumActivePerKey() {
-        HashMap<String,Integer> result = new HashMap<String,Integer>();
+        HashMap<String,Integer> result = new HashMap<>();
 
         Iterator<Entry<K,ObjectDeque<T>>> iter = poolMap.entrySet().iterator();
         while (iter.hasNext()) {
@@ -1346,7 +1347,7 @@ public class GenericKeyedObjectPool<K,T>
      */
     @Override
     public Map<String,Integer> getNumWaitersByKey() {
-        Map<String,Integer> result = new HashMap<String,Integer>();
+        Map<String,Integer> result = new HashMap<>();
 
         for (K key : poolMap.keySet()) {
             ObjectDeque<T> queue = poolMap.get(key);
@@ -1376,13 +1377,13 @@ public class GenericKeyedObjectPool<K,T>
     @Override
     public Map<String,List<DefaultPooledObjectInfo>> listAllObjects() {
         Map<String,List<DefaultPooledObjectInfo>> result =
-                new HashMap<String,List<DefaultPooledObjectInfo>>();
+                new HashMap<>();
 
         for (K key : poolMap.keySet()) {
             ObjectDeque<T> queue = poolMap.get(key);
             if (queue != null) {
                 List<DefaultPooledObjectInfo> list =
-                        new ArrayList<DefaultPooledObjectInfo>();
+                        new ArrayList<>();
                 result.put(key.toString(), list);
                 for (PooledObject<T> p : queue.getAllObjects().values()) {
                     list.add(new DefaultPooledObjectInfo(p));
@@ -1401,7 +1402,7 @@ public class GenericKeyedObjectPool<K,T>
     private class ObjectDeque<S> {
 
         private final LinkedBlockingDeque<PooledObject<S>> idleObjects =
-                new LinkedBlockingDeque<PooledObject<S>>();
+                new LinkedBlockingDeque<>();
 
         /*
          * Number of instances created - number destroyed.
@@ -1415,7 +1416,7 @@ public class GenericKeyedObjectPool<K,T>
          * work properly.
          */
         private final Map<S, PooledObject<S>> allObjects =
-                new ConcurrentHashMap<S, PooledObject<S>>();
+                new ConcurrentHashMap<>();
 
         /*
          * Number of threads with registered interest in this key.
@@ -1481,14 +1482,14 @@ public class GenericKeyedObjectPool<K,T>
      * changes to the list of current keys is made in a thread-safe manner.
      */
     private final Map<K,ObjectDeque<T>> poolMap =
-            new ConcurrentHashMap<K,ObjectDeque<T>>(); // @GuardedBy("keyLock") for write access (and some read access)
+            new ConcurrentHashMap<>(); // @GuardedBy("keyLock") for write access (and some read access)
     /*
      * List of pool keys - used to control eviction order. The list of keys
      * <b>must</b> be kept in step with {@link #poolMap} using {@link #keyLock}
      * to ensure any changes to the list of current keys is made in a
      * thread-safe manner.
      */
-    private final List<K> poolKeyList = new ArrayList<K>(); // @GuardedBy("keyLock")
+    private final List<K> poolKeyList = new ArrayList<>(); // @GuardedBy("keyLock")
     private final ReadWriteLock keyLock = new ReentrantReadWriteLock(true);
     /*
      * The combined count of the currently active objects for all keys and those
@@ -1502,5 +1503,5 @@ public class GenericKeyedObjectPool<K,T>
 
     // JMX specific attributes
     private static final String ONAME_BASE =
-        "org.apache.commons.pool2:type=GenericKeyedObjectPool,name=";
+        "org.apache.tomcat.dbcp.pool2:type=GenericKeyedObjectPool,name=";
 }

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolConfig.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 /**
  * A simple "struct" encapsulating the configuration for a

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolMXBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolMXBean.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolMXBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPoolMXBean.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.util.List;
 import java.util.Map;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -26,14 +26,12 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PoolUtils;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.PooledObjectState;
-import org.apache.commons.pool2.SwallowedExceptionListener;
-import org.apache.commons.pool2.TrackedUse;
-import org.apache.commons.pool2.UsageTracking;
+import org.apache.tomcat.dbcp.pool2.ObjectPool;
+import org.apache.tomcat.dbcp.pool2.PoolUtils;
+import org.apache.tomcat.dbcp.pool2.PooledObject;
+import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObjectState;
+import org.apache.tomcat.dbcp.pool2.UsageTracking;
 
 /**
  * A configurable {@link ObjectPool} implementation.
@@ -57,7 +55,8 @@ import org.apache.commons.pool2.UsageTra
  * Abandoned object removal can be configured to happen when
  * <code>borrowObject</code> is invoked and the pool is close to starvation, or
  * it can be executed by the idle object evictor, or both. If pooled objects
- * implement the {@link TrackedUse} interface, their last use will be queried
+ * implement the {@link org.apache.tomcat.dbcp.pool2.TrackedUse} interface,
+ * their last use will be queried
  * using the <code>getLastUsed</code> method on that interface; otherwise
  * abandonment is determined by how long an object has been checked out from
  * the pool.</p>
@@ -526,7 +525,8 @@ public class GenericObjectPool<T> extend
      * this case, if validation fails, the instance is destroyed.
      * <p>
      * Exceptions encountered destroying objects for any reason are swallowed
-     * but notified via a {@link SwallowedExceptionListener}.
+     * but notified via a
+     * {@link org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener}.
      */
     @Override
     public void returnObject(T obj) {
@@ -656,7 +656,8 @@ public class GenericObjectPool<T> extend
      * idle instance pool, even during its execution. Additional instances may
      * be returned while removed items are being destroyed.</li>
      * <li>Exceptions encountered destroying idle instances are swallowed
-     * but notified via a {@link SwallowedExceptionListener}.</li>
+     * but notified via a
+     * {@link org.apache.tomcat.dbcp.pool2.SwallowedExceptionListener}.</li>
      * </ul>
      */
     @Override
@@ -967,7 +968,7 @@ public class GenericObjectPool<T> extend
         final long now = System.currentTimeMillis();
         final long timeout =
                 now - (ac.getRemoveAbandonedTimeout() * 1000L);
-        ArrayList<PooledObject<T>> remove = new ArrayList<PooledObject<T>>();
+        ArrayList<PooledObject<T>> remove = new ArrayList<>();
         Iterator<PooledObject<T>> it = allObjects.values().iterator();
         while (it.hasNext()) {
             PooledObject<T> pooledObject = it.next();
@@ -1065,7 +1066,7 @@ public class GenericObjectPool<T> extend
     @Override
     public Set<DefaultPooledObjectInfo> listAllObjects() {
         Set<DefaultPooledObjectInfo> result =
-                new HashSet<DefaultPooledObjectInfo>(allObjects.size());
+                new HashSet<>(allObjects.size());
         for (PooledObject<T> p : allObjects.values()) {
             result.add(new DefaultPooledObjectInfo(p));
         }
@@ -1089,7 +1090,7 @@ public class GenericObjectPool<T> extend
      * wrappers used internally by the pool.
      */
     private final Map<T, PooledObject<T>> allObjects =
-        new ConcurrentHashMap<T, PooledObject<T>>();
+        new ConcurrentHashMap<>();
     /*
      * The combined count of the currently created objects and those in the
      * process of being created. Under load, it may exceed {@link #_maxActive}
@@ -1099,11 +1100,11 @@ public class GenericObjectPool<T> extend
      */
     private final AtomicLong createCount = new AtomicLong(0);
     private final LinkedBlockingDeque<PooledObject<T>> idleObjects =
-        new LinkedBlockingDeque<PooledObject<T>>();
+        new LinkedBlockingDeque<>();
 
     // JMX specific attributes
     private static final String ONAME_BASE =
-        "org.apache.commons.pool2:type=GenericObjectPool,name=";
+        "org.apache.tomcat.dbcp.pool2:type=GenericObjectPool,name=";
 
     // Additional configuration properties for abandoned object tracking
     private volatile AbandonedConfig abandonedConfig = null;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 /**
  * A simple "struct" encapsulating the configuration for a

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.util.Set;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.util.Collection;
 import java.util.concurrent.locks.Condition;

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.io.Serializable;
 import java.util.AbstractQueue;
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * An optionally-bounded {@linkplain java.util.concurrent.BlockingDeque blocking
@@ -215,7 +214,7 @@ class LinkedBlockingDeque<E> extends Abs
         if (count >= capacity)
             return false;
         Node<E> f = first;
-        Node<E> x = new Node<E>(e, null, f);
+        Node<E> x = new Node<>(e, null, f);
         first = x;
         if (last == null)
             last = x;
@@ -238,7 +237,7 @@ class LinkedBlockingDeque<E> extends Abs
         if (count >= capacity)
             return false;
         Node<E> l = last;
-        Node<E> x = new Node<E>(e, l, null);
+        Node<E> x = new Node<>(e, l, null);
         last = x;
         if (first == null)
             first = x;
@@ -1053,7 +1052,7 @@ class LinkedBlockingDeque<E> extends Abs
     public void clear() {
         lock.lock();
         try {
-            for (Node<E> f = first; f != null; ) {
+            for (Node<E> f = first; f != null;) {
                 f.item = null;
                 Node<E> n = f.next;
                 f.prev = null;
@@ -1265,7 +1264,8 @@ class LinkedBlockingDeque<E> extends Abs
 
     /**
      * Returns true if there are threads waiting to take instances from this deque.
-     * See disclaimer on accuracy in {@link ReentrantLock#hasWaiters(Condition)}.
+     * See disclaimer on accuracy in
+     * {@link java.util.concurrent.locks.ReentrantLock#hasWaiters(Condition)}.
      *
      * @return true if there is at least one thread waiting on this deque's notEmpty condition.
      */
@@ -1280,7 +1280,8 @@ class LinkedBlockingDeque<E> extends Abs
 
     /**
      * Returns the length of the queue of threads waiting to take instances from this deque.
-     * See disclaimer on accuracy in {@link ReentrantLock#getWaitQueueLength(Condition)}.
+     * See disclaimer on accuracy in
+     * {@link java.util.concurrent.locks.ReentrantLock#getWaitQueueLength(Condition)}.
      *
      * @return number of threads waiting on this deque's notEmpty condition.
      */
@@ -1296,7 +1297,7 @@ class LinkedBlockingDeque<E> extends Abs
     /**
      * Interrupts the threads currently waiting to take an object from the pool.
      * See disclaimer on accuracy in
-     * {@link ReentrantLock#getWaitingThreads(Condition)}.
+     * {@link java.util.concurrent.locks.ReentrantLock#getWaitingThreads(Condition)}.
      */
     public void interuptTakeWaiters() {
         lock.lock();

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java Fri May  9 15:25:43 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 
-import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
 
 /**
  * Implementation specific utilities.

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.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.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
 import java.lang.ref.SoftReference;
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java?rev=1593563&r1=1593515&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java Fri May  9 15:25:43 2014
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.pool2.impl;
+package org.apache.tomcat.dbcp.pool2.impl;
 
-import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.pool2.BaseObjectPool;
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PoolUtils;
-import org.apache.commons.pool2.PooledObjectFactory;
+import org.apache.tomcat.dbcp.pool2.BaseObjectPool;
+import org.apache.tomcat.dbcp.pool2.PoolUtils;
+import org.apache.tomcat.dbcp.pool2.PooledObjectFactory;
 
 /**
- * A {@link java.lang.ref.SoftReference SoftReference} based {@link ObjectPool}.
+ * A {@link java.lang.ref.SoftReference SoftReference} based
+ * {@link org.apache.tomcat.dbcp.pool2.ObjectPool}.
  * <p>
  * This class is intended to be thread-safe.
  *
@@ -50,7 +49,7 @@ public class SoftReferenceObjectPool<T> 
      * <code>_pool</code>. This is used to help {@link #getNumIdle()} be more
      * accurate with minimal performance overhead.
      */
-    private final ReferenceQueue<T> refQueue = new ReferenceQueue<T>();
+    private final ReferenceQueue<T> refQueue = new ReferenceQueue<>();
 
     /** Count of instances that have been checkout out to pool clients */
     private int numActive = 0; // @GuardedBy("this")
@@ -63,11 +62,11 @@ public class SoftReferenceObjectPool<T> 
 
     /** Idle references - waiting to be borrowed */
     private final LinkedBlockingDeque<PooledSoftReference<T>> idleReferences =
-        new LinkedBlockingDeque<PooledSoftReference<T>>();
+        new LinkedBlockingDeque<>();
 
     /** All references - checked out or waiting to be borrowed. */
     private final ArrayList<PooledSoftReference<T>> allReferences =
-        new ArrayList<PooledSoftReference<T>>();
+        new ArrayList<>();
 
     /**
      * Create a <code>SoftReferenceObjectPool</code> with the specified factory.
@@ -85,13 +84,13 @@ public class SoftReferenceObjectPool<T> 
      * new instance.
      * <p>
      * All instances are {@link PooledObjectFactory#activateObject(
-     * org.apache.commons.pool2.PooledObject) activated}
+     * org.apache.tomcat.dbcp.pool2.PooledObject) activated}
      * and {@link PooledObjectFactory#validateObject(
-     * org.apache.commons.pool2.PooledObject)
+     * org.apache.tomcat.dbcp.pool2.PooledObject)
      * validated} before being returned by this method. If validation fails or
      * an exception occurs activating or validating an idle instance, the
      * failing instance is {@link PooledObjectFactory#destroyObject(
-     * org.apache.commons.pool2.PooledObject)
+     * org.apache.tomcat.dbcp.pool2.PooledObject)
      * destroyed} and another instance is retrieved from the pool, validated and
      * activated. This process continues until either the pool is empty or an
      * instance passes validation. If the pool is empty on activation or it does
@@ -128,7 +127,7 @@ public class SoftReferenceObjectPool<T> 
                     obj = factory.makeObject().getObject();
                     createCount++;
                     // Do not register with the queue
-                    ref = new PooledSoftReference<T>(new SoftReference<T>(obj));
+                    ref = new PooledSoftReference<>(new SoftReference<>(obj));
                     allReferences.add(ref);
                 }
             } else {
@@ -138,7 +137,7 @@ public class SoftReferenceObjectPool<T> 
                 // a new, non-registered reference so we can still track this object
                 // in allReferences
                 ref.getReference().clear();
-                ref.setReference(new SoftReference<T>(obj));
+                ref.setReference(new SoftReference<>(obj));
             }
             if (null != factory && null != obj) {
                 try {
@@ -176,10 +175,10 @@ public class SoftReferenceObjectPool<T> 
      * <ul>
      * <li>the pool is closed</li>
      * <li>{@link PooledObjectFactory#validateObject(
-     * org.apache.commons.pool2.PooledObject) validation} fails
+     * org.apache.tomcat.dbcp.pool2.PooledObject) validation} fails
      * </li>
      * <li>{@link PooledObjectFactory#passivateObject(
-     * org.apache.commons.pool2.PooledObject) passivation}
+     * org.apache.tomcat.dbcp.pool2.PooledObject) passivation}
      * throws an exception</li>
      * </ul>
      * Exceptions passivating or destroying instances are silently swallowed.
@@ -250,12 +249,12 @@ public class SoftReferenceObjectPool<T> 
      * <p>
      * Before being added to the pool, the newly created instance is
      * {@link PooledObjectFactory#validateObject(
-     * org.apache.commons.pool2.PooledObject) validated} and
+     * org.apache.tomcat.dbcp.pool2.PooledObject) validated} and
      * {@link PooledObjectFactory#passivateObject(
-     * org.apache.commons.pool2.PooledObject) passivated}. If
+     * org.apache.tomcat.dbcp.pool2.PooledObject) passivated}. If
      * validation fails, the new instance is
      * {@link PooledObjectFactory#destroyObject(
-     * org.apache.commons.pool2.PooledObject) destroyed}. Exceptions
+     * org.apache.tomcat.dbcp.pool2.PooledObject) destroyed}. Exceptions
      * generated by the factory <code>makeObject</code> or
      * <code>passivate</code> are propagated to the caller. Exceptions
      * destroying instances are silently swallowed.
@@ -276,8 +275,8 @@ public class SoftReferenceObjectPool<T> 
         T obj = factory.makeObject().getObject();
         createCount++;
         // Create and register with the queue
-        PooledSoftReference<T> ref = new PooledSoftReference<T>(
-                new SoftReference<T>(obj, refQueue));
+        PooledSoftReference<T> ref = new PooledSoftReference<>(
+                new SoftReference<>(obj, refQueue));
         allReferences.add(ref);
 
         boolean success = true;

Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1593563&r1=1593562&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java Fri May  9 15:25:43 2014
@@ -24,8 +24,8 @@ import java.util.Properties;
 import org.junit.After;
 import org.junit.Before;
 
-//import org.apache.commons.dbcp2.BasicDataSource;
-//import org.apache.commons.dbcp2.BasicDataSourceFactory;
+//import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+//import org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory;
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory;
 import org.apache.tomcat.jdbc.pool.PoolConfiguration;

Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1593563&r1=1593562&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Fri May  9 15:25:43 2014
@@ -125,6 +125,18 @@
     <subpackage name="buildutil">
       <allow pkg="org.apache.tools.ant"/>
     </subpackage>
+    <subpackage name="dbcp">
+      <allow pkg="org.apache.juli"/>
+      <subpackage name="dbcp2">
+        <allow pkg="org.apache.tomcat.dbcp.dbcp2"/>
+        <allow pkg="org.apache.tomcat.dbcp.pool2"/>
+      </subpackage>
+      <subpackage name="pool2">
+        <subpackage name="impl">
+          <allow pkg="org.apache.tomcat.dbcp.pool2"/>
+        </subpackage>
+      </subpackage>
+    </subpackage>
     <subpackage name="jni">
       <subpackage name="socket">
         <allow pkg="org.apache.tomcat.jni"/>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593563&r1=1593562&r2=1593563&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May  9 15:25:43 2014
@@ -368,6 +368,12 @@
         Update package renamed Apache Commons Codec to r1586336 to pick up some
         Javadoc fixes and some code clean up. (markt)
       </update>
+      <update>
+        Switch to including Apache Commons DBCP via a package renamed  svn copy
+        rather than building from a source release for consistency with other
+        Commons packages and to allow faster releases to fix DBCP related
+        issues. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>



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


Mime
View raw message