debian/0000775000000000000000000000000011776525220007177 5ustar debian/rules0000775000000000000000000000127111776520565010267 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := commons-collections3 commons-pool junit geronimo-jta_1.1_spec PACKAGE=commons-dbcp DEB_ANT_CLEAN_TARGET := clean DEB_ANT_BUILD_TARGET := build #DEB_ANT_CHECK_TARGET := test # Per Debian Java Policy, install a versioned JAR and an unversioned symlink binary-post-install/lib$(PACKAGE)-java:: mh_installpoms -plib$(PACKAGE)-java mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar clean:: -rm -rf debian/tmp -rm -fr doc/api get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename debian/libcommons-dbcp-java-doc.install0000664000000000000000000000006011776521574015325 0ustar dist/docs/* usr/share/doc/libcommons-dbcp-java debian/libcommons-dbcp-java-doc.doc-base.api0000664000000000000000000000050311633152335016071 0ustar Document: libcommons-dbcp-java Title: API Javadoc for Commons DBCP Author: Commons DBCP developers Abstract: This is the API Javadoc provided for the libcommons-dbcp-java library. Section: Programming Format: HTML Index: /usr/share/doc/libcommons-dbcp-java/api/index.html Files: /usr/share/doc/libcommons-dbcp-java/api/* debian/libcommons-dbcp-java.poms0000664000000000000000000000274411770175121014070 0ustar # List of POM files for the package # Format of this file is: # [option]* # where option can be: # --ignore: ignore this POM or # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact # --has-package-version: to indicate that the original version of the POM is the same as the upstream part # of the version for the package. # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, # it will be installed when using the command mh_install # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java # --dest-jar=: the destination for the real jar # it will be installed with mh_install. # --classifier=: Optional, the classifier for the jar. Empty by default. # --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created # temporarily for certain artifacts such as Javadoc jars. # pom.xml --no-parent --has-package-version --java-lib debian/maven.rules0000664000000000000000000000026011776520716011364 0ustar junit junit jar s/3\..*/3.x/ * s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/ commons-collections commons-collections jar s/3\..*/3.x/ debian/control0000664000000000000000000000432011776520637010610 0ustar Source: libcommons-dbcp-java Section: java Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, libgeronimo-jta-1.1-spec-java, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc Standards-Version: 3.9.1 Homepage: http://commons.apache.org/dbcp/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-dbcp-java/ Package: libcommons-dbcp-java Architecture: all Depends: ${misc:Depends}, libcommons-pool-java, libcommons-collections3-java Recommends: libgeronimo-jta-1.1-spec-java Suggests: libcommons-dbcp-java-doc Description: Database Connection Pooling Services The DBCP package provides database connection pooling services. The following features are supported . * DataSource and Driver interfaces to the pool. * Support for arbitrary sources of the underlying Connections. * Integration with arbitrary org.apache.commons.pool.ObjectPool implementations. * Support for Connection validation, expiration, etc. * Support for PreparedStatement pooling. * XML configuration. . This is a part of the Apache Commons Project. Package: libcommons-dbcp-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Recommends: libcommons-pool-java-doc, default-jdk-doc Suggests: libcommons-dbcp-java Description: Database Connection Pooling Services - documentation The DBCP package provides database connection pooling services. The following features are supported . * DataSource and Driver interfaces to the pool. * Support for arbitrary sources of the underlying Connections. * Integration with arbitrary org.apache.commons.pool.ObjectPool implementations. * Support for Connection validation, expiration, etc. * Support for PreparedStatement pooling. * XML configuration. . This is a part of the Apache Commons Project. . This package contains Javadoc API Documentation of Commons DBCP. debian/copyright0000664000000000000000000000164711770175121011135 0ustar This package was debianized by Arnaud Vandyck on Sat, 5 Apr 2003 17:48:00 +0200. It was downloaded from http://commons.apache.org/dbcp/ Upstream Authors: Morgan Delagrange, Geir Magnusson, Craig McClanahan, John McNally, Martin Poeschl , Rodney Waldhoff, David Weinrich, Dirk Verbeeck, Yoav Shapira , Phil Steitz, Jörg Schaible , Todd Carmichael , Wayne Woodfield, Dain Sundstrom Copyright: © 2001-2008 The Apache Software Foundation License: Apache 2.0 On Debian systems the full text of the Apache License can be found in `/usr/share/common-licenses/Apache-2.0'. debian/TODO0000664000000000000000000000002611633152335007660 0ustar - build and run tests debian/orig-tar.sh0000664000000000000000000000112411770175121011250 0ustar #!/bin/sh -e # $2 version # $3 upstream tarball TAR=../libcommons-dbcp-java_$2.orig.tar.gz DIR=libcommons-dbcp-java-$2.orig # From SVN #VERSION=`echo $2 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'` #REVISION=HEAD #REVISION=`echo $2 | sed -e 's/.*svn//'` #svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR # From Tarball tar xvzf $3 mv commons-dbcp-* $DIR # Repack GZIP=--best tar -c -z -f $TAR $DIR rm -rf $DIR # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout mv $TAR $origDir echo "moved $TAR to $origDir" fi exit 0 debian/watch0000664000000000000000000000016711770175121010227 0ustar version=3 http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz \ debian debian/orig-tar.sh debian/changelog0000664000000000000000000001730211776525220011054 0ustar libcommons-dbcp-java (1.4-3ubuntu1) quantal; urgency=low * Resync from Debian unstable. * Revert package to ant buildsystem: + d/ant.properties: Specifiy location of dependencies for build, set source/target version of Java to 1.5. + d/control: Switch BD/BDI's for ant based build, manually specify dependencies for binary packages. + d/libcommons-dbcp-java-doc.install: Pickup docs from ant build location. + d/maven.rules: Specify mappings for installed maven artifacts. + d/patches/01_build.patch: Patch ant build file for Javadoc locations. + d/rules: Rewrite for ant based build. + d/maven.*, d/patches/0001-configure-source-and-target-version-1.5.patch, d/README.source: Dropped as not required for ant based build. -- James Page Mon, 09 Jul 2012 10:54:50 +0100 libcommons-dbcp-java (1.4-3) unstable; urgency=low * Team upload. * Apply patch from James Page that: - fixes FTBFS with Openjdk-7 - Bumps geronimo-jta (build-)dependencies (Closes: #678167) * Remove Michael Koch from uploaders - Thanks for you work on this package so far. (Closes: #654051) -- Niels Thykier Tue, 19 Jun 2012 20:20:28 +0200 libcommons-dbcp-java (1.4-2) unstable; urgency=low * Team upload. * Switch to source format 3.0. * Remove Java runtime from Depends. * Update Standards-Version: 3.9.1. * Use Maven to build the package. -- Torsten Werner Sun, 11 Sep 2011 17:15:36 +0200 libcommons-dbcp-java (1.4-1ubuntu2) quantal; urgency=low * Fix FTBFS with openjdk-7 (LP: #888125): - debian/patches/02_java7_compat.patch: Cherry picked patch from Fedora transition for compatibility with Java 7. * d/control: Use libgeronimo-jta-1.1-spec-java instead of deprecated libgeronimo-jta-1.0.1b-spec-java. -- James Page Fri, 08 Jun 2012 10:02:16 +0100 libcommons-dbcp-java (1.4-1ubuntu1) maverick; urgency=low * Merge from debian testing. Remaining changes: - Replace glassfish-javaee by libgeronimo-jta-1.0.1b-spec-java, since the former is in universe and the latter in main -- Thierry Carrez Fri, 11 Jun 2010 15:09:25 +0200 libcommons-dbcp-java (1.4-1) unstable; urgency=low * New upstream release: * Use commons-collections 3.x: - Build-Depends and Depends on libcommons-collection3-java - Update classpath in DEB_JARS from debian/rules - Fix transformation in debian/maven.rules * Remove Arnaud Vandyck from Uploaders * Javadoc: - Build-Depends on default-jdk-doc - Link generated Javadoc with it - libcommons-dbcp-java-doc now Recommends default-jdk-doc * Rewrite debian/watch and debian/orig-tar.sh to work with upstream stable release instead of svn snapshot. -- Damien Raude-Morvan Sat, 20 Feb 2010 22:50:18 +0100 libcommons-dbcp-java (1.3~svn828639-1ubuntu1) lucid; urgency=low * Replace glassfish-javaee by libgeronimo-jta-1.0.1b-spec-java, since the former is in universe and the latter in main (LP: #495504) -- Thierry Carrez Fri, 11 Dec 2009 15:58:16 +0100 libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low * New upstream SVN snapshot (r828639) * Update my email address * Bumped debhelper version to 7 -- Damien Raude-Morvan Fri, 23 Oct 2009 22:44:57 +0200 libcommons-dbcp-java (1.3~svn803474-1) unstable; urgency=low [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons * debian/copyright: Switch to Apache License 2.0. Closes: #532888. [ Damien Raude-Morvan ] * New upstream SVN snapshot (r803474). - Fix FTBFS when using OpenJDK-6 (JDBC4 API) (Closes: #539179) - Add Build-Depends and Suggests on glassfish-javaee * Add myself as Uploaders * Bump Debhelper to 5 * Use default-jdk/jre: - Build-Depends on default-jdk - Depends on default-jre-headless - Use /usr/lib/jvm/default-java as JAVA_HOME * Updated Standards-Version to 3.8.3: - Change section to "java" - Include a get-orig-source target - Add Homepage field * Remove useless dirs/links debhelper files * Split Javadoc API in a -doc package * Use quilt as patch system * Maven POMs: - Add a Build-Depends-Indep dependency on maven-repo-helper - Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api -- Damien Raude-Morvan Tue, 18 Aug 2009 21:04:39 +0200 libcommons-dbcp-java (1.2.2-1) unstable; urgency=low * New upstream release * Added watch file -- Michael Koch Tue, 19 Jun 2007 15:58:41 +0200 libcommons-dbcp-java (1.2.1-5) unstable; urgency=low * Merge from Ubuntu. * Fixed Depends of libcommons-dbcp-java to allow all Java runtimes to be used. * Moved debhelper and cdbs to from Builds-Depends-Indep to Build-Depends. * Added myself to Uploaders and removed Wolfgang. * Updated Standards-Version to 3.7.2. -- Michael Koch Sat, 09 Jun 2007 12:23:34 -0100 libcommons-dbcp-java (1.2.1-4ubuntu1) feisty; urgency=low * Re-sync with Debian. Changes retained: * Depend java-gcj-compat rather than java runtimes -- Barry deFreese Fri, 26 Jan 2007 19:13:45 -0500 libcommons-dbcp-java (1.2.1-4) unstable; urgency=low * kaffe compiler transition + Removed build compiler jikes setting in debian/rules + Build-Depend only on kaffe * Standards-version 3.6.2 (no changes) * Depend on kaffe | java1-runtime | java2-runtime * Bumped debhelper version to fix linda error * Added myself to uploaders -- Wolfgang Baer Sun, 15 Jan 2006 16:45:00 +0100 libcommons-dbcp-java (1.2.1-3) unstable; urgency=low * libant1.6-java to ant transition -- Arnaud Vandyck Sat, 20 Aug 2005 19:41:10 +0200 libcommons-dbcp-java (1.2.1-2) unstable; urgency=low * built with kaffe * now build the javadoc (closes: #234640). -- Arnaud Vandyck Mon, 28 Feb 2005 11:50:22 +0100 libcommons-dbcp-java (1.2.1-1) unstable; urgency=low * New upstream release -- Arnaud Vandyck Sun, 11 Jul 2004 20:09:12 +0200 libcommons-dbcp-java (1.0-6) unstable; urgency=low * added cdbs, jikes and libant1.5-java, thanks to Goswin Brederlow (closes: #258684) * now build with sablevm * updated standard to 3.6.1 (nothing to change) * no more documentation at the moment -- Arnaud Vandyck Sun, 11 Jul 2004 19:54:00 +0200 libcommons-dbcp-java (1.0-5) unstable; urgency=low * Move to main! c-pool and c-collections are now in main. * debian/rules (clean): now clean the doc/api directory -- Arnaud Vandyck Thu, 8 Apr 2004 17:04:32 +0200 libcommons-dbcp-java (1.0-4) unstable; urgency=low * added the java2-runtime dependency to let the choice to the user, thanks to ADFH (?! ;) (closes: #233648). -- Arnaud Vandyck Thu, 19 Feb 2004 12:02:34 +0100 libcommons-dbcp-java (1.0-3) unstable; urgency=low * Removed the java2 dependency. -- Arnaud Vandyck Mon, 16 Feb 2004 15:51:50 +0100 libcommons-dbcp-java (1.0-2) unstable; urgency=low * debian/rules: now build with cdbs and kaffe 1:1.1.3 * debian/control: - changed the maintainer field and me to the uploaders with my debian email - (Build-Depends-Indep): added libcommons-collections-java -- Arnaud Vandyck Sat, 10 Jan 2004 18:14:37 +0100 libcommons-dbcp-java (1.0-1) unstable; urgency=low * Initial Release (closes: #188574). -- Arnaud Vandyck Sat, 12 Jul 2003 11:33:30 +0200 debian/ant.properties0000664000000000000000000000025111776524034012077 0ustar commons-collections.jar=/usr/share/java/commons-collections3.jar commons-pool.jar=/usr/share/java/commons-pool.jar ant.build.javac.source=1.5 ant.build.javac.target=1.5 debian/compat0000664000000000000000000000000211770175121010370 0ustar 7 debian/source/0000775000000000000000000000000011770175121010472 5ustar debian/source/format0000664000000000000000000000001411630403713011674 0ustar 3.0 (quilt) debian/patches/0000775000000000000000000000000011776523637010640 5ustar debian/patches/02_java7_compat.patch0000664000000000000000000004272611770175120014530 0ustar Description: Compatibility patch for OpenJDK7 Origin: https://bugzilla.redhat.com/show_bug.cgi?id=796638 Author: Pavel Tisnovsky Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:38.106421672 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:38.106421672 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-06-06 15:30:38.106421672 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-06-06 15:30:38.106421672 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-06-06 15:30:38.106421672 +0100 @@ -37,6 +37,7 @@ import java.sql.RowId; import java.sql.SQLXML; /* JDBC_4_ANT_KEY_END */ +import java.sql.SQLFeatureNotSupportedException; /** * A base delegating implementation of {@link CallableStatement}. @@ -661,4 +662,14 @@ } } /* JDBC_4_ANT_KEY_END */ + + /* This functionality is not implemented yet */ + public T getObject(String columnLabel, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public T getObject(int columnIndex, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-06-06 15:30:38.110421690 +0100 @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.Executor; import java.sql.ResultSet; /* JDBC_4_ANT_KEY_BEGIN */ import java.sql.Array; @@ -40,6 +41,7 @@ import java.util.Collections; import java.util.Properties; /* JDBC_4_ANT_KEY_END */ +import java.sql.SQLFeatureNotSupportedException; /** * A base delegating implementation of {@link Connection}. @@ -678,5 +680,31 @@ return null; } } -/* JDBC_4_ANT_KEY_END */ + /* JDBC_4_ANT_KEY_END */ + + /* This functionality is not implemented yet */ + public int getNetworkTimeout() throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public void abort(Executor executor) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public String getSchema() throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public void setSchema(String schema) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } } + Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-06-06 15:30:38.110421690 +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(); + } } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-06-06 15:30:38.110421690 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-06-06 15:30:38.110421690 +0100 @@ -40,6 +40,7 @@ import java.sql.RowId; import java.sql.SQLXML; /* JDBC_4_ANT_KEY_END */ +import java.sql.SQLFeatureNotSupportedException; /** * A base delegating implementation of {@link ResultSet}. @@ -1079,4 +1080,14 @@ } } /* JDBC_4_ANT_KEY_END */ + + /* This functionality is not implemented yet */ + public T getObject(String columnLabel, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public T getObject(int columnIndex, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-06-06 15:30:38.110421690 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-06-06 15:30:38.110421690 +0100 @@ -21,6 +21,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.List; import org.apache.commons.pool.KeyedObjectPool; @@ -123,4 +124,13 @@ super.passivate(); } + /* This functionality is not implemented yet */ + public T getObject(String columnLabel, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } + + /* This functionality is not implemented yet */ + public T getObject(int columnIndex, Class type) throws SQLException { + throw new SQLFeatureNotSupportedException(); + } } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-06-06 15:30:38.110421690 +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(); + } + } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-06-06 15:30:38.110421690 +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(); + } } + Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-06-06 15:30:38.110421690 +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(); + } } Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java =================================================================== --- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-06-06 15:30:07.241314000 +0100 +++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-06-06 15:30:38.110421690 +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(); + } + } debian/patches/01_build.patch0000664000000000000000000000136011776520415013247 0ustar Description: Cleanup upstream build.xml: - Use local Javadoc index from default-jdk-doc - Set test.failonerror to false Origin: vendor Forwarded: not-needed Author: Damien Raude-Morvan Last-Update: 2010-02-20 --- a/build.xml +++ b/build.xml @@ -179,8 +179,8 @@ nohelp="true" nonavbar="false" serialwarn="false"> - - + + --- /dev/null +++ b/build.properties @@ -0,0 +1 @@ +test.failonerror=false debian/patches/series0000664000000000000000000000004511776520431012041 0ustar 01_build.patch 02_java7_compat.patch