You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/06/13 17:29:12 UTC
[50/50] [abbrv] commons-dbcp git commit: Merge branch 'master' into
release.
Merge branch 'master' into release.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/fb23b153
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/fb23b153
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/fb23b153
Branch: refs/heads/release
Commit: fb23b1530cfcf68004bf59a6a3e2a68fe79426b1
Parents: f8b2186 8c42fb8
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 13 11:28:10 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 13 11:28:10 2018 -0600
----------------------------------------------------------------------
.gitignore | 4 +-
CONTRIBUTING.md | 2 +-
README.md | 14 +-
RELEASE-NOTES.txt | 47 +-
build.properties.sample | 58 -
build.xml | 283 ---
dbcp-RC.sh | 2 +-
dbcp-pre-RC.sh | 2 +-
dbcp-release.sh | 4 +-
doc/README.txt | 2 +-
pom.xml | 2 +-
src/changes/changes.xml | 47 +-
src/changes/release-notes.vm | 2 +-
.../apache/commons/dbcp2/AbandonedTrace.java | 72 +-
.../apache/commons/dbcp2/BasicDataSource.java | 1356 ++++++-------
.../commons/dbcp2/BasicDataSourceFactory.java | 248 +--
.../commons/dbcp2/BasicDataSourceMXBean.java | 40 +
.../apache/commons/dbcp2/ConnectionFactory.java | 7 +-
.../org/apache/commons/dbcp2/Constants.java | 13 +-
.../dbcp2/DataSourceConnectionFactory.java | 64 +-
.../dbcp2/DelegatingCallableStatement.java | 1069 ++++++++---
.../commons/dbcp2/DelegatingConnection.java | 525 +++---
.../dbcp2/DelegatingDatabaseMetaData.java | 1595 ++++++++++------
.../dbcp2/DelegatingPreparedStatement.java | 499 +++--
.../commons/dbcp2/DelegatingResultSet.java | 1774 +++++++++++++-----
.../commons/dbcp2/DelegatingStatement.java | 500 +++--
.../commons/dbcp2/DriverConnectionFactory.java | 35 +-
.../dbcp2/DriverManagerConnectionFactory.java | 71 +-
.../dbcp2/LifetimeExceededException.java | 5 +-
.../org/apache/commons/dbcp2/ListException.java | 57 +
.../apache/commons/dbcp2/ObjectNameWrapper.java | 6 +-
.../java/org/apache/commons/dbcp2/PStmtKey.java | 562 ++++--
.../dbcp2/PoolableCallableStatement.java | 68 +-
.../commons/dbcp2/PoolableConnection.java | 67 +-
.../dbcp2/PoolableConnectionFactory.java | 301 +--
.../commons/dbcp2/PoolableConnectionMXBean.java | 17 +-
.../dbcp2/PoolablePreparedStatement.java | 53 +-
.../apache/commons/dbcp2/PoolingConnection.java | 738 ++++----
.../apache/commons/dbcp2/PoolingDataSource.java | 122 +-
.../org/apache/commons/dbcp2/PoolingDriver.java | 105 +-
.../commons/dbcp2/SwallowedExceptionLogger.java | 21 +-
.../java/org/apache/commons/dbcp2/Utils.java | 91 +-
.../dbcp2/cpdsadapter/ConnectionImpl.java | 219 ++-
.../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 481 ++---
.../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 94 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 642 ++++---
.../datasources/CPDSConnectionFactory.java | 231 +--
.../datasources/InstanceKeyDataSource.java | 715 +++----
.../InstanceKeyDataSourceFactory.java | 282 ++-
.../datasources/KeyedCPDSConnectionFactory.java | 205 +-
.../datasources/PerUserPoolDataSource.java | 1480 ++++++++-------
.../PerUserPoolDataSourceFactory.java | 52 +-
.../commons/dbcp2/datasources/PoolKey.java | 54 +-
.../datasources/PooledConnectionAndInfo.java | 55 +-
.../datasources/PooledConnectionManager.java | 30 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 137 +-
.../SharedPoolDataSourceFactory.java | 12 +-
.../commons/dbcp2/datasources/UserPassKey.java | 108 +-
.../dbcp2/managed/BasicManagedDataSource.java | 90 +-
.../managed/DataSourceXAConnectionFactory.java | 109 +-
.../dbcp2/managed/LocalXAConnectionFactory.java | 134 +-
.../dbcp2/managed/ManagedConnection.java | 75 +-
.../dbcp2/managed/ManagedDataSource.java | 46 +-
.../managed/PoolableManagedConnection.java | 38 +-
.../PoolableManagedConnectionFactory.java | 31 +-
.../dbcp2/managed/TransactionContext.java | 85 +-
.../managed/TransactionContextListener.java | 8 +-
.../dbcp2/managed/TransactionRegistry.java | 63 +-
.../dbcp2/managed/XAConnectionFactory.java | 24 +-
.../org/apache/commons/dbcp2/package-info.java | 207 +-
src/site/site.xml | 1 +
src/site/xdoc/configuration.xml | 1012 +++++-----
src/site/xdoc/download_dbcp.xml | 26 +-
src/site/xdoc/guide/classdiagrams.xml | 58 +-
src/site/xdoc/guide/index.xml | 50 +-
src/site/xdoc/guide/jndi-howto.xml | 2 +-
src/site/xdoc/guide/sequencediagrams.xml | 52 +-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/mail-lists.xml | 8 +-
.../apache/commons/dbcp2/StackMessageLog.java | 1 -
.../dbcp2/TestAbandonedBasicDataSource.java | 6 +-
.../commons/dbcp2/TestBasicDataSource.java | 8 +-
.../dbcp2/TestBasicDataSourceFactory.java | 6 +-
.../commons/dbcp2/TestConnectionPool.java | 13 +-
.../commons/dbcp2/TestDelegatingConnection.java | 1 -
.../dbcp2/TestDelegatingPreparedStatement.java | 2 -
.../commons/dbcp2/TestDelegatingStatement.java | 2 -
.../TestDriverManagerConnectionFactory.java | 11 +-
.../java/org/apache/commons/dbcp2/TestJndi.java | 44 +-
.../org/apache/commons/dbcp2/TestPStmtKey.java | 84 +
.../apache/commons/dbcp2/TestPStmtPooling.java | 2 -
.../dbcp2/TestPStmtPoolingBasicDataSource.java | 2 -
.../commons/dbcp2/TestPoolableConnection.java | 1 -
.../commons/dbcp2/TestPoolingDataSource.java | 7 +-
.../apache/commons/dbcp2/TestPoolingDriver.java | 8 +-
.../org/apache/commons/dbcp2/TestUtils.java | 2 +-
.../commons/dbcp2/TesterCallableStatement.java | 2 -
.../apache/commons/dbcp2/TesterConnection.java | 13 +-
.../commons/dbcp2/TesterDatabaseMetaData.java | 10 +-
.../org/apache/commons/dbcp2/TesterDriver.java | 54 +-
.../commons/dbcp2/TesterPreparedStatement.java | 5 +-
.../apache/commons/dbcp2/TesterResultSet.java | 3 -
.../apache/commons/dbcp2/TesterStatement.java | 7 +-
.../cpdsadapter/TestDriverAdapterCPDS.java | 17 +-
.../ConnectionPoolDataSourceProxy.java | 23 +-
.../datasources/PooledConnectionProxy.java | 31 +-
.../datasources/TestCPDSConnectionFactory.java | 28 +-
.../commons/dbcp2/datasources/TestFactory.java | 11 +-
.../datasources/TestInstanceKeyDataSource.java | 12 +-
.../TestKeyedCPDSConnectionFactory.java | 14 +-
.../datasources/TestPerUserPoolDataSource.java | 4 +-
.../datasources/TestSharedPoolDataSource.java | 153 +-
.../managed/TestBasicManagedDataSource.java | 2 +-
.../managed/TestConnectionWithNarayana.java | 236 +++
.../dbcp2/managed/TestManagedConnection.java | 2 +-
.../dbcp2/managed/TestManagedDataSource.java | 4 +-
.../managed/TestManagedDataSourceInTx.java | 2 -
.../dbcp2/managed/TestTransactionContext.java | 10 +-
118 files changed, 10668 insertions(+), 7643 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/fb23b153/pom.xml
----------------------------------------------------------------------