This commit is contained in:
commit
715a5bc92b
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
19
apache-commons-dbcp-javadoc.patch
Normal file
19
apache-commons-dbcp-javadoc.patch
Normal file
@ -0,0 +1,19 @@
|
||||
--- commons-dbcp-1.4-src/build.xml 2018-12-13 17:33:38.072128307 +0100
|
||||
+++ commons-dbcp-1.4-src/build.xml 2018-12-13 17:34:46.740477159 +0100
|
||||
@@ -163,6 +163,7 @@
|
||||
<target name="javadoc" depends="prepare" description="generates javadocs">
|
||||
<mkdir dir="${javadoc.dir}"/>
|
||||
<javadoc packagenames="org.*"
|
||||
+ source="${javac.source}"
|
||||
sourcepath="${src.java.dir}"
|
||||
classpath="${classpath}"
|
||||
destdir="${javadoc.dir}"
|
||||
@@ -181,8 +182,6 @@
|
||||
nohelp="true"
|
||||
nonavbar="false"
|
||||
serialwarn="false">
|
||||
- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
|
||||
- <link href="http://commons.apache.org/pool/apidocs"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
423
apache-commons-dbcp-jdbc41.patch
Normal file
423
apache-commons-dbcp-jdbc41.patch
Normal file
@ -0,0 +1,423 @@
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2018-12-13 17:36:19.956950724 +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> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
+
|
||||
+ /* This functionality is not implemented yet */
|
||||
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2018-12-13 17:36:19.956950724 +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}.
|
||||
@@ -679,4 +681,30 @@
|
||||
}
|
||||
}
|
||||
/* 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();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2018-12-13 17:36:19.956950724 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2018-12-13 17:36:19.956950724 +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> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
+
|
||||
+ /* This functionality is not implemented yet */
|
||||
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2018-12-13 17:36:19.960950745 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2018-12-13 17:36:19.960950745 +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> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
+
|
||||
+ /* This functionality is not implemented yet */
|
||||
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
||||
+ throw new SQLFeatureNotSupportedException();
|
||||
+ }
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2018-12-13 17:36:19.960950745 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java 2018-12-13 17:36:19.960950745 +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();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2018-12-13 17:36:19.960950745 +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();
|
||||
+ }
|
||||
}
|
||||
--- commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java 2018-12-13 17:36:19.960950745 +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();
|
||||
+ }
|
||||
+
|
||||
}
|
40
apache-commons-dbcp-sourcetarget.patch
Normal file
40
apache-commons-dbcp-sourcetarget.patch
Normal file
@ -0,0 +1,40 @@
|
||||
--- commons-dbcp-1.4-src/build.xml 2010-02-07 17:59:20.000000000 +0100
|
||||
+++ commons-dbcp-1.4-src/build.xml 2018-12-13 17:31:58.987624926 +0100
|
||||
@@ -133,6 +133,7 @@
|
||||
<property name="src.java.dir" value="${src.dir}/java"/>
|
||||
<property name="src.test.dir" value="${src.dir}/test"/>
|
||||
<property name="javac.source" value="1.4" />
|
||||
+ <property name="javac.target" value="1.4" />
|
||||
|
||||
<mkdir dir="${src.dir}"/>
|
||||
<copy todir="${src.dir}" filtering="yes">
|
||||
@@ -153,7 +154,8 @@
|
||||
<property name="src.dir" value="${basedir}/src"/>
|
||||
<property name="src.java.dir" value="${src.dir}/java"/>
|
||||
<property name="src.test.dir" value="${src.dir}/test"/>
|
||||
- <property name="javac.source" value="1.5" />
|
||||
+ <property name="javac.source" value="1.7" />
|
||||
+ <property name="javac.target" value="1.7" />
|
||||
</target>
|
||||
|
||||
<target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
|
||||
@@ -194,7 +196,8 @@
|
||||
debug="${javac.debug}"
|
||||
deprecation="${javac.deprecation}"
|
||||
optimize="${javac.optimize}"
|
||||
- source="${javac.source}">
|
||||
+ source="${javac.source}"
|
||||
+ target="${javac.target}">
|
||||
<exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
|
||||
unless="jndi.present"/>
|
||||
<exclude name="org/apache/commons/dbcp/datasources/**"
|
||||
@@ -211,7 +214,8 @@
|
||||
debug="${javac.debug}"
|
||||
deprecation="${javac.deprecation}"
|
||||
optimize="${javac.optimize}"
|
||||
- source="${javac.source}">
|
||||
+ source="${javac.source}"
|
||||
+ target="${javac.target}">
|
||||
<classpath>
|
||||
<pathelement location="${build.classes.dir}" />
|
||||
<pathelement location="${build.test-classes.dir}" />
|
12
apache-commons-dbcp1.changes
Normal file
12
apache-commons-dbcp1.changes
Normal file
@ -0,0 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 15 14:06:03 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Initial package for apache-commons-dbcp1, providing the
|
||||
commons-dbcp API 1.x
|
||||
- Added patches:
|
||||
* apache-commons-dbcp-sourcetarget.patch
|
||||
+ build with java source and target level 1.7
|
||||
* apache-commons-dbcp-javadoc.patch
|
||||
+ do not load external javadoc links over internet
|
||||
* apache-commons-dbcp-jdbc41.patch
|
||||
+ port to JDBC 4.1 (Java SE 1.7)
|
147
apache-commons-dbcp1.spec
Normal file
147
apache-commons-dbcp1.spec
Normal file
@ -0,0 +1,147 @@
|
||||
#
|
||||
# spec file for package apache-commons-dbcp
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define base_name dbcp
|
||||
%define short_name commons-%{base_name}
|
||||
Name: apache-%{short_name}1
|
||||
Version: 1.4
|
||||
Release: 0
|
||||
Summary: Jakarta Commons DataBase Pooling Package
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: https://commons.apache.org/proper/commons-dbcp/
|
||||
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source100: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
|
||||
Source101: commons.keyring
|
||||
Patch0: apache-commons-dbcp-sourcetarget.patch
|
||||
Patch1: apache-commons-dbcp-javadoc.patch
|
||||
Patch2: apache-commons-dbcp-jdbc41.patch
|
||||
BuildRequires: ant >= 1.6.5
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-parent
|
||||
BuildRequires: apache-commons-pool
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: geronimo-jta-1_1-api
|
||||
BuildRequires: java-devel >= 1.7
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: jdbc-stdext >= 2.0
|
||||
BuildRequires: junit >= 3.8.1
|
||||
BuildRequires: xerces-j2
|
||||
Requires: apache-commons-parent
|
||||
Requires: commons-collections >= 3.2
|
||||
Requires: commons-pool
|
||||
Requires: jta_api >= 1.1
|
||||
Requires(post): update-alternatives
|
||||
Requires(preun): update-alternatives
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
Obsoletes: %{short_name} < %{version}-%{release}
|
||||
Provides: hibernate_jdbc_cache
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The DBCP package creates and maintains a database connection pool
|
||||
package written in the Java language to be distributed under the ASF
|
||||
license. The package is available as a pseudo-JDBC driver and via a
|
||||
DataSource interface. The package also supports multiple logins to
|
||||
multiple database systems, reclamation of stale or dead connections,
|
||||
testing for valid connections, PreparedStatement pooling, and other
|
||||
features.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for jakarta-commons-dbcp
|
||||
Group: Development/Libraries/Java
|
||||
|
||||
%description javadoc
|
||||
This package contains the javadoc documentation for the DBCP package.
|
||||
|
||||
The DBCP package shall create and maintain a database connection pool
|
||||
package written in the Java language to be distributed under the ASF
|
||||
license. The package shall be available as a pseudo-JDBC driver and via
|
||||
a DataSource interface. The package shall also support multiple logins
|
||||
to multiple database systems, reclamation of stale or dead connections,
|
||||
testing for valid connections, PreparedStatement pooling, and other
|
||||
features.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
# remove all binary libs
|
||||
find . -name "*.jar" -exec rm -f {} \;
|
||||
|
||||
%build
|
||||
ant \
|
||||
-Dcommons-pool.jar=$(build-classpath commons-pool) \
|
||||
-Djdbc20ext.jar=$(build-classpath jdbc-stdext) \
|
||||
-Djunit.jar=$(build-classpath junit) \
|
||||
-Dxerces.jar=$(build-classpath xerces-j2) \
|
||||
-Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \
|
||||
-Dcommons-logging.jar=$(build-classpath commons-logging) \
|
||||
-Djava.io.tmpdir=. \
|
||||
-Djta-impl.jar=$(build-classpath jta) \
|
||||
dist
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
install -m 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/apache-%{short_name}-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/apache-%{short_name}-%{version}.pom
|
||||
%add_maven_depmap apache-%{short_name}-%{version}.pom apache-%{short_name}-%{version}.jar
|
||||
# javadoc
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
# hibernate_jdbc_cache ghost symlink
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
|
||||
ln -sf %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar %{buildroot}%{_javadir}/hibernate_jdbc_cache.jar
|
||||
|
||||
%post
|
||||
update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
|
||||
hibernate_jdbc_cache %{_javadir}/apache-%{short_name}.jar 60
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ] ; then
|
||||
update-alternatives --remove hibernate_jdbc_cache %{_javadir}/apache-%{short_name}.jar
|
||||
fi
|
||||
|
||||
%files
|
||||
%license LICENSE.txt
|
||||
%{_javadir}/apache-%{short_name}.jar
|
||||
%{_javadir}/apache-%{short_name}-%{version}.jar
|
||||
%{_javadir}/%{short_name}.jar
|
||||
%{_javadir}/%{short_name}-%{version}.jar
|
||||
%{_javadir}/hibernate_jdbc_cache.jar
|
||||
%ghost %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
|
||||
%{_mavenpomdir}/apache-%{short_name}-%{version}.pom
|
||||
%if %{defined _maven_repository}
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%else
|
||||
%{_datadir}/maven-metadata/%{name}.xml*
|
||||
%endif
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
3
commons-dbcp-1.4-src.tar.gz
Normal file
3
commons-dbcp-1.4-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
|
||||
size 932507
|
7
commons-dbcp-1.4-src.tar.gz.asc
Normal file
7
commons-dbcp-1.4-src.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.8 (Darwin)
|
||||
|
||||
iEYEABECAAYFAktu/tMACgkQzTA4/vB9Vn5rDQCeKobwR+L2onRw+4wr+YjmtchJ
|
||||
7TAAn25asI5AyQ4KFJhdvveuwcZHi/Rh
|
||||
=PMaD
|
||||
-----END PGP SIGNATURE-----
|
6825
commons.keyring
Normal file
6825
commons.keyring
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user