diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec index cea1110..da71945 100644 --- a/apache-commons-dbcp.spec +++ b/apache-commons-dbcp.spec @@ -28,16 +28,6 @@ Url: https://commons.apache.org/proper/commons-dbcp/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source100: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc Source101: commons.keyring -Source1: pom-maven2jpp-depcat.xsl -Source2: pom-maven2jpp-newdepmap.xsl -Source3: pom-maven2jpp-mapdeps.xsl -Source4: %{base_name}-%{version}-jpp-depmap.xml -Source5: commons-build.tar.bz2 -Source7: commons-dbcp-1.2.2.pom -Patch0: commons-dbcp-1.2.2-project_xml.patch -#improved from https://issues.apache.org/jira/browse/DBCP-191 -#http://pkgs.fedoraproject.org/gitweb/?p=apache-commons-dbcp.git;a=blob_plain;f=jdbc41.patch;hb=HEAD -Patch3: jdbc41.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-logging BuildRequires: apache-commons-pool2 @@ -88,15 +78,8 @@ features. %prep %setup -q -n %{short_name}-%{version}-src -# quick hack -#cp LICENSE.txt ../LICENSE # remove all binary libs find . -name "*.jar" -exec rm -f {} \; -bzip2 -dc %{SOURCE5} | tar xf - -#%patch0 -b .sav -#%patch1 -b .sav1 -#%patch2 -b .target15 -#%patch3 %build ant \ @@ -107,7 +90,7 @@ ant \ -Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \ -Dnaming-common.jar=$(build-classpath tomcat/catalina) \ -Dnaming-java.jar=$(build-classpath tomcat/catalina) \ - -Dlogging.jar=$(build-classpath commons-logging) \ + -Dcommons-logging.jar=$(build-classpath commons-logging) \ -Djava.io.tmpdir=. \ dist diff --git a/commons-build.tar.bz2 b/commons-build.tar.bz2 deleted file mode 100644 index d8ebf5f..0000000 --- a/commons-build.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cca660848595ef4d1bf21943eb6a7dc52f7dcbe476f1dee79b83f5085005b7b2 -size 98979 diff --git a/commons-dbcp-1.2.2-project_xml.patch b/commons-dbcp-1.2.2-project_xml.patch deleted file mode 100644 index dd338b7..0000000 --- a/commons-dbcp-1.2.2-project_xml.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- project.xml.sav 2007-08-28 16:19:16.000000000 +0200 -+++ project.xml 2007-08-28 16:20:45.000000000 +0200 -@@ -193,6 +193,24 @@ - - - -+ -+ xerces -+ xercesImpl -+ 2.8.0 -+ -+ test -+ -+ -+ -+ -+ xerces -+ xml-apis -+ 1.3.03 -+ -+ test -+ -+ -+ - - - tomcat diff --git a/commons-dbcp-1.2.2.pom b/commons-dbcp-1.2.2.pom deleted file mode 100644 index 6c7dccf..0000000 --- a/commons-dbcp-1.2.2.pom +++ /dev/null @@ -1,275 +0,0 @@ - - 4.0.0 - commons-dbcp - commons-dbcp - Commons DBCP - 1.2.2 - Commons Database Connection Pooling - http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/ - - http://issues.apache.org/jira/ - - - - - -
commons-dev@jakarta.apache.org
- - - - - 2001 - - - Commons Dev List - commons-dev-subscribe@jakarta.apache.org - commons-dev-unsubscribe@jakarta.apache.org - http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ - - - Commons User List - commons-user-subscribe@jakarta.apache.org - commons-user-unsubscribe@jakarta.apache.org - http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ - - - - - morgand - Morgan Delagrange - - - - - geirm - Geir Magnusson - - - - - craigmcc - Craig McClanahan - - - - - jmcnally - John McNally - - - - - mpoeschl - Martin Poeschl - mpoeschl@marmot.at - tucana.at - - - rwaldhoff - Rodney Waldhoff - - - - - dweinr1 - David Weinrich - - - - - dirkv - Dirk Verbeeck - - - - - yoavs - Yoav Shapira - yoavs@apache.org - Apache Software Foundation - - - psteitz - Phil Steitz - - - - - joehni - J?rg Schaible - joerg.schaible@gmx.de - - +1 - - - - - Todd Carmichael - toddc@concur.com - - - Wayne Woodfield - - - - - The Apache Software License, Version 2.0 - /LICENSE.txt - - - - scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk - http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk - - - The Apache Software Foundation - http://jakarta.apache.org - - - src/java - src/test - - - ${basedir}/src/test - - testpool.jocl - - - - META-INF - ${basedir} - - NOTICE.txt - - - - - - ${basedir}/src/test - - testpool.jocl - - - - - - maven-surefire-plugin - - - org/apache/commons/dbcp/TestAbandonedObjectPool.java - org/apache/commons/jocl/TestJOCLContentHandler.java - org/apache/commons/dbcp/TestDelegatingConnection.java - org/apache/commons/dbcp/TestPoolableConnection.java - org/apache/commons/dbcp/TestDelegatingPreparedStatement.java - org/apache/commons/dbcp/TestDelegatingStatement.java - org/apache/commons/dbcp/TestJOCLed.java - org/apache/commons/dbcp/TestManual.java - org/apache/commons/dbcp/TestBasicDataSourceFactory.java - org/apache/commons/dbcp/TestBasicDataSource.java - org/apache/commons/dbcp/TestAbandonedBasicDataSource.java - org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java - org/apache/commons/dbcp/TestPoolingDataSource.java - org/apache/commons/dbcp/TestJndi.java - org/apache/commons/dbcp/datasources/TestFactory.java - org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java - org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java - - - - - maven-artifact-plugin - 1.5 - - test - <strong>Build Only</strong> Generates distributions. - - - - maven-xdoc-plugin - 1.9.2 - - <strong>Site Only</strong> - v1.9.2 (minimum) - required for building the project web site. - - - - maven-plugins - maven-cobertura-plugin - 1.1.1 - - test - <strong>Site Only</strong> Generates test coverage reports. - - - - maven-plugins - maven-findbugs-plugin - 1.3 - - test - <strong>Site Only</strong> - - - - maven-pmd-plugin - 1.9 - - test - <strong>Site Only</strong> - - - - maven-checkstyle-plugin - 3.0.1 - - test - <strong>Site Only</strong> - - - - - - - commons-pool - commons-pool - 1.3 - - - junit - junit - 3.8.1 - test - - - tomcat - naming-common - 5.0.28 - test - - - tomcat - naming-java - 5.0.28 - test - - - commons-logging - commons-logging - 1.0.4 - test - - - - - default - Default Repository - file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/ - - - default - Default Site - scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/ - - converted - - \ No newline at end of file diff --git a/dbcp-1.2.2-jpp-depmap.xml b/dbcp-1.2.2-jpp-depmap.xml deleted file mode 100644 index d8bdac9..0000000 --- a/dbcp-1.2.2-jpp-depmap.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - commons-logging - commons-logging - 1.0.4 - http://jakarta.apache.org/commons/logging - - - JPP - commons-logging - commons-logging.jar - 1.0.4 - http://jakarta.apache.org/commons/logging - - - - - commons-pool - commons-pool - 1.3 - - - JPP - commons-pool - commons-pool.jar - 1.3 - - - - - junit - junit - 3.8.1 - - - JPP - junit - junit.jar - 3.8.1 - - - - - xerces - xercesImpl - 2.8.0 - - - JPP - xercesImpl - xerces-j2.jar - 2.9.0 - - - - - xerces - xml-apis - 1.3.03 - - - JPP - xml-apis - xml-commons-jaxp-1.3-apis.jar - 1.3.03 - - - - - maven - maven-artifact-plugin - 1.5 - http://www.ibiblio.org/maven/maven/plugins/ - plugin - - - JPP - maven-artifact-plugin - maven-artifact-plugin.jar - 1.5 - http://www.ibiblio.org/maven/maven/plugins/ - plugin - - - - - maven - maven-checkstyle-plugin - 3.0.1 - plugin - - - JPP - maven-checkstyle-plugin - maven-checkstyle-plugin.jar - 3.0.1 - plugin - - - - - maven-plugins - maven-cobertura-plugin - 1.1.1 - http://maven-plugins.sourceforge.net/maven-cobertura-plugin/ - plugin - - - JPP - maven-cobertura-plugin - maven-cobertura-plugin.jar - 1.1.1 - http://maven-plugins.sourceforge.net/maven-cobertura-plugin/ - plugin - - - - - maven-plugins - maven-findbugs-plugin - 1.3 - plugin - - - JPP - maven-findbugs-plugin - maven-findbugs-plugin.jar - 1.3 - plugin - - - - - maven - maven-pmd-plugin - 1.9 - plugin - - - JPP - maven-pmd-plugin - maven-pmd-plugin.jar - 1.9 - plugin - - - - - maven - maven-xdoc-plugin - 1.9.2 - http://maven.apache.org/reference/plugins/xdoc/ - plugin - - - JPP - maven-xdoc-plugin - maven-xdoc-plugin.jar - 1.9.2 - http://maven.apache.org/reference/plugins/xdoc/ - plugin - - - - - tomcat - naming-common - 5.0.28 - - - JPP - naming-common - tomcat5/naming-resources.jar - 5.0.28 - - - - - tomcat - naming-java - 5.0.28 - - - JPP - naming-java - tomcat5/naming-factory.jar - 5.0.28 - - - diff --git a/jdbc41.patch b/jdbc41.patch deleted file mode 100644 index a69f3fe..0000000 --- a/jdbc41.patch +++ /dev/null @@ -1,610 +0,0 @@ -Index: src/java/org/apache/commons/dbcp/BasicDataSource.java -=================================================================== ---- src/java/org/apache/commons/dbcp/BasicDataSource.java.orig 2012-05-25 11:00:29.875161362 +0200 -+++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-05-25 11:02:59.705157897 +0200 -@@ -19,10 +19,12 @@ - - import java.io.PrintWriter; - import java.util.Properties; -+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.impl.GenericKeyedObjectPool; -@@ -1277,4 +1279,10 @@ - logWriter.println(message); - } - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java -=================================================================== ---- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-05-25 11:01:48.199159547 +0200 -@@ -18,12 +18,14 @@ - package org.apache.commons.dbcp.cpdsadapter; - - import java.util.Hashtable; -+import java.util.logging.Logger; - import java.io.PrintWriter; - import java.io.Serializable; - import java.sql.DriverManager; - import java.sql.SQLException; - import javax.sql.PooledConnection; - import javax.sql.ConnectionPoolDataSource; -+import java.sql.SQLFeatureNotSupportedException; - import javax.naming.Name; - import javax.naming.Context; - import javax.naming.Referenceable; -@@ -600,4 +602,10 @@ - { - _maxPreparedStatements = maxPreparedStatements; - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java -=================================================================== ---- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-05-25 11:02:12.245158994 +0200 -@@ -21,9 +21,11 @@ - 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.logging.Logger; - - import javax.naming.NamingException; - import javax.naming.Reference; -@@ -515,4 +517,10 @@ - throw new IOException("NamingException: " + e); - } - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java -=================================================================== ---- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-05-25 11:02:36.557158432 +0200 -@@ -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 java.util.Map; - - import javax.naming.NamingException; -@@ -254,5 +256,11 @@ - throw new IOException("NamingException: " + e); - } - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ - } - -Index: src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java -=================================================================== ---- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java.orig 2012-05-25 11:00:29.877161362 +0200 -+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-05-25 11:00:44.958161014 +0200 -@@ -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}. -@@ -670,4 +671,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(); -+ } - } -Index: src/java/org/apache/commons/dbcp/DelegatingConnection.java -=================================================================== ---- src/java/org/apache/commons/dbcp/DelegatingConnection.java.orig 2012-05-25 11:00:29.877161362 +0200 -+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-05-25 11:03:21.187157402 +0200 -@@ -26,6 +26,7 @@ - import java.sql.Statement; - import java.util.List; - import java.util.Map; -+import java.util.concurrent.Executor; - /* JDBC_4_ANT_KEY_BEGIN */ - import java.sql.Array; - import java.sql.Blob; -@@ -39,6 +40,7 @@ - import java.util.Map; - import java.util.Properties; - /* JDBC_4_ANT_KEY_END */ -+import java.sql.SQLFeatureNotSupportedException; - - /** - * A base delegating implementation of {@link Connection}. -@@ -639,5 +641,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(); -+ } - } -+ -Index: src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java -=================================================================== ---- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java.orig 2012-05-25 11:00:29.877161362 +0200 -+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-05-25 11:00:44.960161014 +0200 -@@ -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}. -@@ -411,4 +412,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(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/DelegatingResultSet.java -=================================================================== ---- src/java/org/apache/commons/dbcp/DelegatingResultSet.java.orig 2012-05-25 11:00:29.878161362 +0200 -+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-05-25 11:00:44.960161014 +0200 -@@ -39,6 +39,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}. -@@ -1045,4 +1046,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(); -+ } - } -Index: src/java/org/apache/commons/dbcp/DelegatingStatement.java -=================================================================== ---- src/java/org/apache/commons/dbcp/DelegatingStatement.java.orig 2012-05-25 11:00:29.878161362 +0200 -+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-05-25 11:00:44.961161014 +0200 -@@ -22,6 +22,7 @@ - import java.sql.SQLException; - import java.sql.SQLWarning; - import java.sql.Statement; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.List; - - /** -@@ -370,4 +371,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(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java -=================================================================== ---- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-05-25 11:00:44.961161014 +0200 -@@ -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; -@@ -117,4 +118,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(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/PoolingConnection.java -=================================================================== ---- src/java/org/apache/commons/dbcp/PoolingConnection.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-05-25 11:00:44.961161014 +0200 -@@ -20,8 +20,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; -@@ -314,4 +316,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(); -+ } - } -+ -Index: src/java/org/apache/commons/dbcp/PoolingDataSource.java -=================================================================== ---- src/java/org/apache/commons/dbcp/PoolingDataSource.java.orig 2012-05-25 11:00:29.878161362 +0200 -+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-05-25 11:00:44.962161014 +0200 -@@ -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; - -@@ -441,4 +443,9 @@ - } - } - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } - } -Index: src/java/org/apache/commons/dbcp/PoolingDriver.java -=================================================================== ---- src/java/org/apache/commons/dbcp/PoolingDriver.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-05-25 11:00:44.962161014 +0200 -@@ -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; -@@ -498,4 +500,10 @@ - } - } - } -+ -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ - } -Index: src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java -=================================================================== ---- src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java.orig 2012-05-25 11:00:29.879161362 +0200 -+++ src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java 2012-05-25 11:17:25.623137869 +0200 -@@ -18,6 +18,7 @@ - package org.apache.commons.dbcp.cpdsadapter; - - import java.util.Map; -+import java.util.concurrent.Executor; - import java.sql.Connection; - import java.sql.DatabaseMetaData; - import java.sql.PreparedStatement; -@@ -25,6 +26,7 @@ - import java.sql.Statement; - import java.sql.SQLWarning; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - /* JDBC_4_ANT_KEY_BEGIN */ - import java.sql.Array; - import java.sql.Blob; -@@ -552,4 +554,20 @@ - return connection.getClientInfo(name); - } - /* JDBC_4_ANT_KEY_END */ -+ -+ public void setSchema(String schema) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public String getSchema() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public void abort(Executor executor) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public int getNetworkTimeout() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } - } -Index: src/test/org/apache/commons/dbcp/TesterConnection.java -=================================================================== ---- src/test/org/apache/commons/dbcp/TesterConnection.java.orig 2012-05-25 11:00:29.911161362 +0200 -+++ src/test/org/apache/commons/dbcp/TesterConnection.java 2012-05-25 11:21:38.111132030 +0200 -@@ -22,9 +22,11 @@ - 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.concurrent.Executor; - /* JDBC_4_ANT_KEY_BEGIN */ - import java.sql.Array; - import java.sql.Blob; -@@ -339,4 +341,20 @@ - throw new SQLException("Not implemented."); - } - /* JDBC_4_ANT_KEY_END */ -+ -+ public void setSchema(String schema) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public String getSchema() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public void abort(Executor executor) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public int getNetworkTimeout() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } - } -Index: src/test/org/apache/commons/dbcp/TesterDriver.java -=================================================================== ---- src/test/org/apache/commons/dbcp/TesterDriver.java.orig 2007-03-25 23:51:25.000000000 +0200 -+++ src/test/org/apache/commons/dbcp/TesterDriver.java 2012-05-25 11:22:43.659130513 +0200 -@@ -22,7 +22,9 @@ - import java.sql.DriverManager; - import java.sql.DriverPropertyInfo; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Properties; -+import java.util.logging.Logger; - - /** - * Mock object implementing the java.sql.Driver interface. -@@ -122,4 +124,10 @@ - protected static int MAJOR_VERSION = 1; - protected static int MINOR_VERSION = 0; - -+ /* This functionality is not implemented yet */ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ -+ - } -Index: src/test/org/apache/commons/dbcp/TesterPreparedStatement.java -=================================================================== ---- src/test/org/apache/commons/dbcp/TesterPreparedStatement.java.orig 2012-05-25 11:00:29.912161362 +0200 -+++ src/test/org/apache/commons/dbcp/TesterPreparedStatement.java 2012-05-25 11:39:08.412107736 +0200 -@@ -27,6 +27,7 @@ - import java.sql.ResultSet; - import java.sql.ResultSetMetaData; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Calendar; - /* JDBC_4_ANT_KEY_BEGIN */ - import java.io.InputStream; -@@ -370,4 +371,20 @@ - throw new SQLException("Not implemented."); - } - /* 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(); -+ } -+ public void closeOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public boolean isCloseOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } - } -Index: src/test/org/apache/commons/dbcp/TesterResultSet.java -=================================================================== ---- src/test/org/apache/commons/dbcp/TesterResultSet.java.orig 2012-05-25 11:00:29.912161362 +0200 -+++ src/test/org/apache/commons/dbcp/TesterResultSet.java 2012-05-25 11:26:54.872124703 +0200 -@@ -25,6 +25,7 @@ - import java.sql.ResultSet; - import java.sql.ResultSetMetaData; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; - import java.sql.Statement; - import java.util.Calendar; -@@ -43,7 +44,7 @@ - * @author Dirk Verbeeck - * @version $Revision: 479142 $ $Date: 2006-11-25 09:31:27 -0700 (Sat, 25 Nov 2006) $ - */ --public class TesterResultSet implements ResultSet { -+public class TesterResultSet implements ResultSet { - public TesterResultSet(Statement stmt) { - _statement = stmt; - } -@@ -967,4 +968,14 @@ - throw new SQLException("Not implemented."); - } - /* 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(); -+ } - } -Index: src/test/org/apache/commons/dbcp/TesterStatement.java -=================================================================== ---- src/test/org/apache/commons/dbcp/TesterStatement.java.orig 2012-05-25 11:00:29.912161362 +0200 -+++ src/test/org/apache/commons/dbcp/TesterStatement.java 2012-05-25 11:39:29.973107237 +0200 -@@ -22,6 +22,8 @@ - import java.sql.SQLException; - import java.sql.SQLWarning; - import java.sql.Statement; -+import java.util.logging.Logger; -+import java.sql.SQLFeatureNotSupportedException; - - /** - * A dummy {@link Statement}, for testing purposes. -@@ -286,4 +288,20 @@ - throw new SQLException("Not implemented."); - } - /* 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(); -+ } -+ public void closeOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } -+ public boolean isCloseOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException(); -+ } - } diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl deleted file mode 100644 index e1042c5..0000000 --- a/pom-maven2jpp-depcat.xsl +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ERROR - - - - - - - - - - JPP - - - - - - - - - - - - - - - - - - - -ERROR - - - - - - - - - - - - - - - - - - -ERROR - - - - - - .jar - . - - - .jar - - - - - - - - - - - - diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl deleted file mode 100644 index d10cce7..0000000 --- a/pom-maven2jpp-mapdeps.xsl +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl deleted file mode 100644 index ea1dcd3..0000000 --- a/pom-maven2jpp-newdepmap.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -