This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 4a9e50a54a Add macro for SSL_CTX_set_dh_auto
new 7574246e07 Update internal fork of Commons DBCP to 2.14.0
new d8d27f2294 Update to Commons Daemon 1.5.1
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 | 2 +-
build.properties.default | 12 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 14 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 46 +++--
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 81 ++++----
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +-
.../tomcat/dbcp/dbcp2/ConnectionFactory.java | 8 +-
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 12 +-
.../dbcp/dbcp2/DataSourceConnectionFactory.java | 12 +-
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 2 +-
.../dbcp/dbcp2/DelegatingCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 33 +--
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 13 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java | 9 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 21 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 47 ++++-
.../tomcat/dbcp/dbcp2/DriverConnectionFactory.java | 4 +-
.../apache/tomcat/dbcp/dbcp2/DriverFactory.java | 4 +-
.../dbcp/dbcp2/DriverManagerConnectionFactory.java | 16 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 12 +-
.../dbcp/dbcp2/LifetimeExceededException.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/ListException.java | 5 +-
.../tomcat/dbcp/dbcp2/LocalStrings.properties | 2 +-
.../tomcat/dbcp/dbcp2/ObjectNameWrapper.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 196 +++++++++---------
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 44 ++--
.../dbcp/dbcp2/PoolableConnectionFactory.java | 56 +++---
.../dbcp/dbcp2/PoolableConnectionMXBean.java | 2 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 40 ++--
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 5 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 6 +-
.../dbcp/dbcp2/SwallowedExceptionLogger.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 6 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 67 ++++---
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 56 ++++--
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 26 +--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 157 +++++++--------
.../dbcp/dbcp2/cpdsadapter/package-info.java | 2 +-
.../datasources/AbstractConnectionFactory.java | 147 ++++++++++++++
.../dbcp2/datasources/CPDSConnectionFactory.java | 221 +--------------------
.../tomcat/dbcp/dbcp2/datasources/CharArray.java | 26 ++-
.../dbcp2/datasources/InstanceKeyDataSource.java | 208 ++++++++++++-------
.../datasources/InstanceKeyDataSourceFactory.java | 10 +-
.../datasources/KeyedCPDSConnectionFactory.java | 182 +++--------------
.../dbcp2/datasources/PerUserPoolDataSource.java | 9 +-
.../datasources/PerUserPoolDataSourceFactory.java | 11 +-
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 7 +-
.../dbcp2/datasources/PooledConnectionAndInfo.java | 2 +-
.../dbcp2/datasources/PooledConnectionManager.java | 31 +--
.../dbcp2/datasources/SharedPoolDataSource.java | 7 +-
.../datasources/SharedPoolDataSourceFactory.java | 4 +-
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 20 +-
.../dbcp/dbcp2/datasources/package-info.java | 2 +-
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 11 +-
.../managed/DataSourceXAConnectionFactory.java | 38 +++-
.../dbcp2/managed/LocalXAConnectionFactory.java | 20 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 34 ++--
.../dbcp/dbcp2/managed/ManagedDataSource.java | 2 +-
.../dbcp2/managed/PoolableManagedConnection.java | 2 +-
.../managed/PoolableManagedConnectionFactory.java | 2 +-
.../dbcp/dbcp2/managed/SynchronizationAdapter.java | 2 +-
.../dbcp/dbcp2/managed/TransactionContext.java | 2 +-
.../dbcp2/managed/TransactionContextListener.java | 2 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java | 2 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/managed/package-info.java | 3 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 2 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 2 +-
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 152 +++++++-------
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 6 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 7 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 4 +-
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 32 +--
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 6 +-
webapps/docs/changelog.xml | 6 +
80 files changed, 1149 insertions(+), 1115 deletions(-)
create mode 100644
java/org/apache/tomcat/dbcp/dbcp2/datasources/AbstractConnectionFactory.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
