This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0533c845d3 Fix BZ 63390 - Fix test on Solaris.
new cf77cc545d Update packaged renamed fork of Commons File Upload
new 740e88d78e Update package renamed fork of Commons BCEL
new 5b71a7174a Update package renamed fork of Commons Codec
new e655e48b56 Update package renamed fork of Commons DBCP
The 4 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 | 8 +-
java/org/apache/catalina/connector/Request.java | 10 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 25 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 355 ++++------
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 78 ++-
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 8 +-
.../dbcp/dbcp2/DataSourceConnectionFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 43 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java | 23 +
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 35 +-
.../apache/tomcat/dbcp/dbcp2/DriverFactory.java | 2 +-
.../dbcp/dbcp2/DriverManagerConnectionFactory.java | 8 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-
.../dbcp/dbcp2/LifetimeExceededException.java | 15 +-
.../tomcat/dbcp/dbcp2/LocalStrings.properties | 2 +-
.../tomcat/dbcp/dbcp2/ObjectNameWrapper.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 758 +++++++--------------
.../dbcp/dbcp2/PoolableCallableStatement.java | 33 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 14 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 58 +-
.../dbcp/dbcp2/PoolableConnectionMXBean.java | 5 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 33 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 66 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 13 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 61 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 60 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 63 +-
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 22 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 165 ++---
.../dbcp/dbcp2/cpdsadapter/package-info.java | 4 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 31 +-
.../tomcat/dbcp/dbcp2/datasources/CharArray.java | 14 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 39 +-
.../datasources/InstanceKeyDataSourceFactory.java | 26 +-
.../datasources/KeyedCPDSConnectionFactory.java | 26 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 294 +++-----
.../datasources/PerUserPoolDataSourceFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 2 +-
.../dbcp2/datasources/PooledConnectionManager.java | 20 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 10 +-
.../datasources/SharedPoolDataSourceFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 2 +-
.../dbcp/dbcp2/datasources/package-info.java | 18 +-
.../managed/DataSourceXAConnectionFactory.java | 50 +-
.../dbcp2/managed/LocalXAConnectionFactory.java | 34 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 8 +-
.../dbcp/dbcp2/managed/ManagedDataSource.java | 2 +-
.../managed/PoolableManagedConnectionFactory.java | 5 +-
.../dbcp/dbcp2/managed/SynchronizationAdapter.java | 18 +-
.../dbcp/dbcp2/managed/TransactionContext.java | 18 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java | 13 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 18 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 5 +-
java/org/apache/tomcat/util/http/Parameters.java | 5 +
.../util/http/fileupload/FileUploadBase.java | 29 +
...n.java => FileCountLimitExceededException.java} | 37 +-
webapps/docs/changelog.xml | 20 +
webapps/docs/config/ajp.xml | 15 +-
webapps/docs/config/http.xml | 15 +-
59 files changed, 1160 insertions(+), 1593 deletions(-)
copy test/org/apache/el/TesterBeanAA.java =>
java/org/apache/tomcat/dbcp/dbcp2/managed/SynchronizationAdapter.java (71%)
copy
java/org/apache/tomcat/util/http/fileupload/impl/{SizeLimitExceededException.java
=> FileCountLimitExceededException.java} (54%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
