This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 1d4f733fe4 Allow avoiding using a comp/env prefix on the datasource
new 7f395bf602 Update fork of Commons DBCP to 2.13.0
new 359c9bcc34 Fix IDE warnings
new bdc7567cfe Align with Commons DBCP
The 3 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 | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 188 ++-
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 36 +-
java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 20 +-
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 12 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 44 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 1381 ++++----------------
.../dbcp/dbcp2/DelegatingPreparedStatement.java | 5 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 6 +-
.../tomcat/dbcp/dbcp2/DriverConnectionFactory.java | 10 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 53 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 149 ++-
.../dbcp/dbcp2/PoolableConnectionMXBean.java | 124 ++
.../dbcp/dbcp2/PoolablePreparedStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 6 +-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 13 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 15 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 47 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 4 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 8 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 26 +-
.../datasources/InstanceKeyDataSourceFactory.java | 90 +-
.../datasources/KeyedCPDSConnectionFactory.java | 3 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 301 ++---
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 2 +
.../dbcp2/datasources/PooledConnectionAndInfo.java | 9 -
.../dbcp2/datasources/SharedPoolDataSource.java | 34 +-
.../datasources/SharedPoolDataSourceFactory.java | 8 +
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 4 -
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +-
.../dbcp2/managed/LocalXAConnectionFactory.java | 17 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 14 +-
.../dbcp2/managed/PoolableManagedConnection.java | 41 +-
.../managed/PoolableManagedConnectionFactory.java | 4 +-
.../dbcp/dbcp2/managed/TransactionContext.java | 1 -
.../dbcp2/managed/TransactionContextListener.java | 7 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java | 8 +-
.../tomcat/dbcp/dbcp2/managed/package-info.java | 2 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 2 +-
webapps/docs/changelog.xml | 3 +
43 files changed, 1169 insertions(+), 1555 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
