pool/apache-commons-dbcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp?expand=0&rev=3

Browse Source
This commit is contained in:
Jan Matejek 2016-09-29 11:51:55 +00:00 committed by Git OBS Bridge
parent 3a28629a4f
commit 3723a51fda
9 changed files with 1 additions and 1335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apache-commons-dbcp.spec
View File

@ -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

3
commons-build.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cca660848595ef4d1bf21943eb6a7dc52f7dcbe476f1dee79b83f5085005b7b2
size 98979

27
commons-dbcp-1.2.2-project_xml.patch
View File

@ -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 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ <properties>
+ <scope>test</scope>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
+ <properties>
+ <scope>test</scope>
+ </properties>
+ </dependency>
+
<!-- tomcat naming jars for jndi reference tests -->
<dependency>
<groupId>tomcat</groupId>

275
commons-dbcp-1.2.2.pom
View File

@ -1,275 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<name>Commons DBCP</name>
<version>1.2.2</version>
<description>Commons Database Connection Pooling</description>
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
<issueManagement>
<url>http://issues.apache.org/jira/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev@jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>morgand</id>
<name>Morgan Delagrange</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>geirm</id>
<name>Geir Magnusson</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>jmcnally</id>
<name>John McNally</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>mpoeschl</id>
<name>Martin Poeschl</name>
<email>mpoeschl@marmot.at</email>
<organization>tucana.at</organization>
</developer>
<developer>
<id>rwaldhoff</id>
<name>Rodney Waldhoff</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>dweinr1</id>
<name>David Weinrich</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>dirkv</id>
<name>Dirk Verbeeck</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>yoavs</id>
<name>Yoav Shapira</name>
<email>yoavs@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>psteitz</id>
<name>Phil Steitz</name>
<email></email>
<organization></organization>
</developer>
<developer>
<id>joehni</id>
<name>J?rg Schaible</name>
<email>joerg.schaible@gmx.de</email>
<organization></organization>
<timezone>+1</timezone>
</developer>
</developers>
<contributors>
<contributor>
<name>Todd Carmichael</name>
<email>toddc@concur.com</email>
</contributor>
<contributor>
<name>Wayne Woodfield</name>
</contributor>
</contributors>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/test</directory>
<includes>
<include>testpool.jocl</include>
</includes>
</resource>
<resource>
<targetPath>META-INF</targetPath>
<directory>${basedir}</directory>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>${basedir}/src/test</directory>
<includes>
<include>testpool.jocl</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
<include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
<include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
<include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
<include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
<include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
<include>org/apache/commons/dbcp/TestJOCLed.java</include>
<include>org/apache/commons/dbcp/TestManual.java</include>
<include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
<include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
<include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
<include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
<include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
<include>org/apache/commons/dbcp/TestJndi.java</include>
<include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
<include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
<include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-artifact-plugin</artifactId>
<version>1.5</version>
<configuration>
<scope>test</scope>
<comment>&lt;strong>Build Only&lt;/strong> Generates distributions.</comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-xdoc-plugin</artifactId>
<version>1.9.2</version>
<configuration>
<comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)
required for building the project web site.</comment>
</configuration>
</plugin>
<plugin>
<groupId>maven-plugins</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<version>1.1.1</version>
<configuration>
<scope>test</scope>
<comment>&lt;strong>Site Only&lt;/strong> Generates test coverage reports.</comment>
</configuration>
</plugin>
<plugin>
<groupId>maven-plugins</groupId>
<artifactId>maven-findbugs-plugin</artifactId>
<version>1.3</version>
<configuration>
<scope>test</scope>
<comment>&lt;strong>Site Only&lt;/strong></comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>1.9</version>
<configuration>
<scope>test</scope>
<comment>&lt;strong>Site Only&lt;/strong></comment>
</configuration>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<scope>test</scope>
<comment>&lt;strong>Site Only&lt;/strong></comment>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-common</artifactId>
<version>5.0.28</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-java</artifactId>
<version>5.0.28</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>

192
dbcp-1.2.2-jpp-depmap.xml
View File

@ -1,192 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<depset>
<dependency>
<maven>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging</url>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<jar>commons-logging.jar</jar>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging</url>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>commons-pool</artifactId>
<jar>commons-pool.jar</jar>
<version>1.3</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<jar>junit.jar</jar>
<version>3.8.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<jar>xerces-j2.jar</jar>
<version>2.9.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>xerces</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<jar>xml-commons-jaxp-1.3-apis.jar</jar>
<version>1.3.03</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven</groupId>
<artifactId>maven-artifact-plugin</artifactId>
<version>1.5</version>
<url>http://www.ibiblio.org/maven/maven/plugins/</url>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-artifact-plugin</artifactId>
<jar>maven-artifact-plugin.jar</jar>
<version>1.5</version>
<url>http://www.ibiblio.org/maven/maven/plugins/</url>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.1</version>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<jar>maven-checkstyle-plugin.jar</jar>
<version>3.0.1</version>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven-plugins</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<version>1.1.1</version>
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<jar>maven-cobertura-plugin.jar</jar>
<version>1.1.1</version>
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven-plugins</groupId>
<artifactId>maven-findbugs-plugin</artifactId>
<version>1.3</version>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-findbugs-plugin</artifactId>
<jar>maven-findbugs-plugin.jar</jar>
<version>1.3</version>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>1.9</version>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<jar>maven-pmd-plugin.jar</jar>
<version>1.9</version>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven</groupId>
<artifactId>maven-xdoc-plugin</artifactId>
<version>1.9.2</version>
<url>http://maven.apache.org/reference/plugins/xdoc/</url>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-xdoc-plugin</artifactId>
<jar>maven-xdoc-plugin.jar</jar>
<version>1.9.2</version>
<url>http://maven.apache.org/reference/plugins/xdoc/</url>
<type>plugin</type>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>tomcat</groupId>
<artifactId>naming-common</artifactId>
<version>5.0.28</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>naming-common</artifactId>
<jar>tomcat5/naming-resources.jar</jar>
<version>5.0.28</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>tomcat</groupId>
<artifactId>naming-java</artifactId>
<version>5.0.28</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>naming-java</artifactId>
<jar>tomcat5/naming-factory.jar</jar>
<version>5.0.28</version>
</jpp>
</dependency>
</depset>

610
jdbc41.patch
View File

@ -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> 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();
+ }
}
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> 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();
+ }
}
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 <code>java.sql.Driver</code> 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> 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();
+ }
+ 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<T> 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> 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();
+ }
}
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> 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();
+ }
+ public void closeOnCompletion() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+ public boolean isCloseOnCompletion() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
}

109
pom-maven2jpp-depcat.xsl
View File

@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
<xsl:strip-space elements="*"/>
<xsl:template match="*[name() != 'dependencies']|*/text()">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="//dependencies">
<xsl:for-each select="./dependency">
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:choose>
<xsl:when test="./groupId">
<xsl:copy-of select="./groupId"/>
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-before(./id/text(),':') != ''">
<xsl:element name="groupId">
<xsl:value-of select="substring-before(./id/text(),':')"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="groupId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
<xsl:element name="jpp">
<xsl:element name="groupId">JPP</xsl:element>
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:element name="jar">
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:value-of select="./artifactId/text()"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./id/text()"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="./type">
<xsl:choose>
<xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
<xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>.jar</xsl:otherwise>
</xsl:choose>
</xsl:element>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
</xsl:element>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>

78
pom-maven2jpp-mapdeps.xsl
View File

@ -1,78 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="map" />
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/project" >
<xsl:element name="project">
<xsl:copy-of select="child::*[not(self::dependencies)]"/>
<xsl:if test="not(./dependencies)">
<xsl:element name="dependencies">
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:if>
<xsl:apply-templates select="dependencies"/>
</xsl:element>
</xsl:template>
<xsl:template match="dependencies" >
<xsl:element name="dependencies">
<xsl:for-each select="dependency">
<xsl:if test="./artifactId">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="./artifactId/text()"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="./id/text()"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
</xsl:for-each>
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:template>
<xsl:template name="replace">
<xsl:param name="artifact"/>
<xsl:variable name="this" select="."/>
<xsl:choose>
<xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:if test="../jpp">
<xsl:element name="dependency">
<xsl:copy-of select="../jpp/*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:for-each select="../add/dependency">
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
</xsl:template>
</xsl:stylesheet>

23
pom-maven2jpp-newdepmap.xsl
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:saxon="http://icl.com/saxon"
extension-element-prefixes="saxon">
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/" >
<xsl:element name="depset">
<saxon:group select="//dependency" group-by="./maven/artifactId">
<xsl:sort select="./maven/artifactId"/>
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:copy-of select="./maven/*[name() != 'properties']"/>
</xsl:element>
<xsl:element name="jpp">
<xsl:copy-of select="./jpp/*[name() != 'properties']"/>
</xsl:element>
</xsl:element>
<saxon:item/>
</saxon:group>
</xsl:element>
</xsl:template>
</xsl:stylesheet>