This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from e1cef2c Tighten up for partial roles and groups configuration
new fbd85f4 Update internal fork of Commons Pool to 2.11.1
new d2e8a3b4 Update internal fork of Commons DBCP to 2.9.0 (2021-08-03)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MERGE.txt | 4 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 33 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 643 ++++--
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 521 ++---
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 330 +--
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 16 +-
.../dbcp/dbcp2/DataSourceConnectionFactory.java | 2 +-
...DataSourceMXBean.java => DataSourceMXBean.java} | 284 ++-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 866 +++----
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 19 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 24 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 19 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 136 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 4 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 30 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 283 ++-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 171 +-
.../dbcp/dbcp2/PoolableConnectionMXBean.java | 44 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 20 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 68 +-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 183 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 225 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 52 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 106 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 193 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 110 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 426 ++--
.../tomcat/dbcp/dbcp2/datasources/CharArray.java | 88 +
.../dbcp2/datasources/InstanceKeyDataSource.java | 1220 +++++-----
.../datasources/InstanceKeyDataSourceFactory.java | 226 +-
.../datasources/KeyedCPDSConnectionFactory.java | 335 +--
.../dbcp2/datasources/PerUserPoolDataSource.java | 343 ++-
.../datasources/PerUserPoolDataSourceFactory.java | 65 +-
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 2 +-
.../dbcp2/datasources/PooledConnectionAndInfo.java | 55 +-
.../dbcp2/datasources/PooledConnectionManager.java | 30 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 104 +-
.../datasources/SharedPoolDataSourceFactory.java | 10 +-
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 53 +-
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 227 +-
.../managed/DataSourceXAConnectionFactory.java | 45 +-
.../dbcp2/managed/LocalXAConnectionFactory.java | 39 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 36 +-
.../dbcp/dbcp2/managed/ManagedDataSource.java | 29 +-
.../managed/PoolableManagedConnectionFactory.java | 3 +-
.../dbcp/dbcp2/managed/TransactionContext.java | 181 +-
.../dbcp2/managed/TransactionContextListener.java | 29 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java | 134 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java | 45 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 70 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 84 +-
.../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 53 +-
java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 10 +-
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 23 +-
.../dbcp/pool2/KeyedPooledObjectFactory.java | 58 +-
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 14 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 2360 ++++++++++----------
.../org/apache/tomcat/dbcp/pool2/PooledObject.java | 308 ++-
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 48 +-
.../tomcat/dbcp/pool2/PooledObjectState.java | 28 +-
.../dbcp/pool2/SwallowedExceptionListener.java | 2 +-
java/org/apache/tomcat/dbcp/pool2/TrackedUse.java | 30 +-
.../apache/tomcat/dbcp/pool2/UsageTracking.java | 15 +-
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java | 325 +--
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 2279 +++++++++++--------
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 906 +++++---
.../apache/tomcat/dbcp/pool2/impl/CallStack.java | 24 +-
.../tomcat/dbcp/pool2/impl/CallStackUtils.java | 2 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 33 +-
.../dbcp/pool2/impl/DefaultPooledObject.java | 321 +--
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 38 +-
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 47 +-
.../tomcat/dbcp/pool2/impl/EvictionConfig.java | 139 +-
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 206 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 1910 ++++++++--------
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 102 +-
.../pool2/impl/GenericKeyedObjectPoolMXBean.java | 217 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 1197 +++++-----
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 72 +-
.../dbcp/pool2/impl/GenericObjectPoolMXBean.java | 206 +-
.../pool2/impl/InterruptibleReentrantLock.java | 10 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 1671 +++++++-------
.../tomcat/dbcp/pool2/impl/NoOpCallStack.java | 8 +-
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 125 +-
.../dbcp/pool2/impl/PooledSoftReference.java | 39 +-
.../dbcp/pool2/impl/SecurityManagerCallStack.java | 104 +-
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 396 ++--
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 41 +-
webapps/docs/changelog.xml | 8 +
90 files changed, 11841 insertions(+), 9801 deletions(-)
copy java/org/apache/tomcat/dbcp/dbcp2/{BasicDataSourceMXBean.java =>
DataSourceMXBean.java} (62%)
create mode 100644 java/org/apache/tomcat/dbcp/dbcp2/datasources/CharArray.java
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
