diff --git a/README.md b/README.md deleted file mode 100644 index bf33d41..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# apache-commons-dbcp - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec new file mode 100644 index 0000000..be08a6e --- /dev/null +++ b/apache-commons-dbcp.spec @@ -0,0 +1,53 @@ +Name: apache-commons-dbcp +Version: 1.4 +Release: 25 +Summary: Apache Commons DataBase Pooling Package +License: ASL 2.0 +URL: http://commons.apache.org/dbcp/ +BuildArch: noarch +Source0: http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz + +Patch0001: jdbc41.patch + +BuildRequires: maven-local mvn(commons-logging:commons-logging) mvn(commons-pool:commons-pool) mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) + +%description +Many Apache projects support interaction with a relational database. Creating a new connection for each user can be +time consuming (often requiring multiple seconds of clock time), in order to perform a database transaction that might take milliseconds. +Opening a connection per user can be unfeasible in a publicly-hosted Internet application where the number of simultaneous users can be very large. Accordingly, +developers often wish to share a "pool" of open connections between all of the application's current users. +The number of users actually performing a request at any given time is usually a very small percentage of the total number of active users, +and during request processing is the only time that a database connection is required. The application itself logs into the DBMS, and handles any user account issues internally. + +%package help +Summary: Help documents for apache-commons-dbcp +Provides: apache-commons-dbcp-javadoc = %{version}-%{release} +Obsoletes: apache-commons-dbcp-javadoc < %{version}-%{release} + +%description help +The apache-commons-dbcp-help package conatins manual pages and documents for apache-commons-dbcp. + +%prep +%autosetup -n commons-dbcp-%{version}-src -p1 +iconv -f iso8859-1 -t utf-8 RELEASE-NOTES.txt > RELEASE-NOTES.txt.conv && mv -f RELEASE-NOTES.txt.conv RELEASE-NOTES.txt + +%mvn_alias : org.apache.commons:commons-dbcp +%mvn_file : apache-commons-dbcp commons-dbcp + +%build +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE.txt + +%files help -f .mfiles-javadoc +%doc NOTICE.txt README.txt RELEASE-NOTES.txt + +%changelog +* Mon Dec 2 2019 liujing - 1.4-25 +- Package init diff --git a/commons-dbcp-1.4-src.tar.gz b/commons-dbcp-1.4-src.tar.gz new file mode 100644 index 0000000..fb3258c Binary files /dev/null and b/commons-dbcp-1.4-src.tar.gz differ diff --git a/jdbc41.patch b/jdbc41.patch new file mode 100644 index 0000000..c3ae0af --- /dev/null +++ b/jdbc41.patch @@ -0,0 +1,440 @@ +diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java +--- a/src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100 +@@ -24,10 +24,12 @@ + import java.util.ArrayList; + import java.util.Iterator; + import java.util.Collections; ++import java.util.logging.Logger; + import java.sql.Connection; + import java.sql.Driver; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import javax.sql.DataSource; + + import org.apache.commons.pool.KeyedObjectPoolFactory; +@@ -1579,4 +1581,10 @@ + logWriter.println(message); + } + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java +--- a/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100 +@@ -19,10 +19,12 @@ + + import java.util.Hashtable; + import java.util.Properties; ++import java.util.logging.Logger; + import java.io.PrintWriter; + import java.io.Serializable; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import javax.sql.PooledConnection; + import javax.sql.ConnectionPoolDataSource; + import javax.naming.Name; +@@ -719,4 +721,10 @@ + { + _maxPreparedStatements = maxPreparedStatements; + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java +--- a/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100 +@@ -21,10 +21,12 @@ + import java.io.ObjectInputStream; + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.HashMap; + import java.util.Iterator; + import java.util.Map; + import java.util.NoSuchElementException; ++import java.util.logging.Logger; + + import javax.naming.NamingException; + import javax.naming.Reference; +@@ -561,4 +563,10 @@ + CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key); + return mgr == null ? null : (GenericObjectPool) mgr.getPool(); + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java +--- a/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100 +@@ -21,6 +21,8 @@ + import java.io.ObjectInputStream; + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + + import javax.naming.NamingException; + import javax.naming.Reference; +@@ -269,5 +271,11 @@ + throw new IOException("NamingException: " + e); + } + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } + +diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java +--- a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100 +@@ -37,6 +37,7 @@ + import java.sql.RowId; + import java.sql.SQLXML; + /* JDBC_4_ANT_KEY_END */ ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A base delegating implementation of {@link CallableStatement}. +@@ -661,4 +662,14 @@ + } + } + /* JDBC_4_ANT_KEY_END */ ++ ++ /* This functionality is not implemented yet */ ++ public T getObject(String columnLabel, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public T getObject(int columnIndex, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java +--- a/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100 +@@ -27,6 +27,7 @@ + import java.util.Iterator; + import java.util.List; + import java.util.Map; ++import java.util.concurrent.Executor; + import java.sql.ResultSet; + /* JDBC_4_ANT_KEY_BEGIN */ + import java.sql.Array; +@@ -40,6 +41,7 @@ + import java.util.Collections; + import java.util.Properties; + /* JDBC_4_ANT_KEY_END */ ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A base delegating implementation of {@link Connection}. +@@ -678,5 +680,31 @@ + return null; + } + } +-/* JDBC_4_ANT_KEY_END */ ++ /* JDBC_4_ANT_KEY_END */ ++ ++ /* This functionality is not implemented yet */ ++ public int getNetworkTimeout() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void abort(Executor executor) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public String getSchema() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void setSchema(String schema) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } ++ +diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java +--- a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100 +@@ -24,6 +24,7 @@ + import java.sql.RowIdLifetime; + /* JDBC_4_ANT_KEY_END */ + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A base delegating implementation of {@link DatabaseMetaData}. +@@ -1208,4 +1209,13 @@ + + /* JDBC_4_ANT_KEY_END */ + ++ /* This functionality is not implemented yet */ ++ public boolean generatedKeyAlwaysReturned() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java +--- a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100 +@@ -34,6 +34,7 @@ + import java.sql.RowId; + import java.sql.SQLXML; + /* JDBC_4_ANT_KEY_END */ ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A base delegating implementation of {@link PreparedStatement}. +@@ -402,4 +403,15 @@ + } + } + /* JDBC_4_ANT_KEY_END */ ++ ++ /* This functionality is not implemented yet */ ++ public boolean isCloseOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void closeOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java +--- a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100 +@@ -40,6 +40,7 @@ + import java.sql.RowId; + import java.sql.SQLXML; + /* JDBC_4_ANT_KEY_END */ ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A base delegating implementation of {@link ResultSet}. +@@ -1079,4 +1080,14 @@ + } + } + /* JDBC_4_ANT_KEY_END */ ++ ++ /* This functionality is not implemented yet */ ++ public T getObject(String columnLabel, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public T getObject(int columnIndex, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java +--- a/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100 +@@ -22,6 +22,7 @@ + import java.sql.SQLException; + import java.sql.SQLWarning; + import java.sql.Statement; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.List; + + /** +@@ -386,4 +387,15 @@ + } + } + /* JDBC_4_ANT_KEY_END */ ++ ++ /* This functionality is not implemented yet */ ++ public boolean isCloseOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void closeOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java +--- a/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100 +@@ -21,6 +21,7 @@ + import java.sql.Connection; + import java.sql.ResultSet; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.List; + + import org.apache.commons.pool.KeyedObjectPool; +@@ -123,4 +124,13 @@ + super.passivate(); + } + ++ /* This functionality is not implemented yet */ ++ public T getObject(String columnLabel, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public T getObject(int columnIndex, Class type) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java +--- a/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100 +@@ -21,6 +21,7 @@ + import java.sql.PreparedStatement; + import java.sql.ResultSet; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.List; + + import org.apache.commons.pool.KeyedObjectPool; +@@ -137,4 +138,14 @@ + super.passivate(); + } + ++ /* This functionality is not implemented yet */ ++ public boolean isCloseOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void closeOnCompletion() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } +diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java +--- a/src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100 +@@ -21,8 +21,10 @@ + import java.sql.Connection; + import java.sql.PreparedStatement; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.NoSuchElementException; ++import java.util.concurrent.Executor; + + import org.apache.commons.pool.KeyedObjectPool; + import org.apache.commons.pool.KeyedPoolableObjectFactory; +@@ -455,4 +457,30 @@ + return buf.toString(); + } + } ++ ++ /* This functionality is not implemented yet */ ++ public int getNetworkTimeout() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void abort(Executor executor) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public String getSchema() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /* This functionality is not implemented yet */ ++ public void setSchema(String schema) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } ++ +diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java +--- a/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100 +@@ -23,10 +23,12 @@ + import java.sql.DatabaseMetaData; + import java.sql.PreparedStatement; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.sql.SQLWarning; + import java.sql.Statement; + import java.util.Map; + import java.util.NoSuchElementException; ++import java.util.logging.Logger; + + import javax.sql.DataSource; + +@@ -437,4 +439,9 @@ + } + } + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java +--- a/src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100 ++++ b/src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100 +@@ -27,6 +27,7 @@ + import java.sql.DriverPropertyInfo; + import java.sql.PreparedStatement; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.sql.SQLWarning; + import java.sql.Statement; + import java.util.HashMap; +@@ -34,6 +35,7 @@ + import java.util.NoSuchElementException; + import java.util.Properties; + import java.util.Set; ++import java.util.logging.Logger; + + import org.apache.commons.jocl.JOCLContentHandler; + import org.apache.commons.pool.ObjectPool; +@@ -496,4 +498,10 @@ + } + } + } ++ ++ /* This functionality is not implemented yet */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + }