[c3p0/f19] Update to latest upstream release
mbooth
mbooth at fedoraproject.org
Fri Mar 29 13:40:08 UTC 2013
commit 7f139b7e10bb85dbeb19aee19c2d6a6d6e634901
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Fri Mar 29 13:23:21 2013 +0000
Update to latest upstream release
- License change to "LGPLv2 or EPL"
.gitignore | 1 +
c3p0-build-on-1.6.patch | 834 +++++++++++++++--------------------------------
c3p0-build-on-1.7.patch | 373 +++++++++++-----------
c3p0.pom | 12 +-
c3p0.spec | 35 +-
sources | 2 +-
6 files changed, 473 insertions(+), 784 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d954ae..e60be53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/c3p0-0.9.2-pre1.src.tgz
+/c3p0-0.9.2.1.tar.gz
diff --git a/c3p0-build-on-1.6.patch b/c3p0-build-on-1.6.patch
index c830cd1..4a47f5a 100644
--- a/c3p0-build-on-1.6.patch
+++ b/c3p0-build-on-1.6.patch
@@ -1,8 +1,8 @@
-diff --git src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
-index d86ff2d..7b65881 100644
---- src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
-+++ src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
-@@ -582,6 +582,21 @@
+diff --git a/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java b/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
+index 9286338..7ebe0d5 100644
+--- a/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
+@@ -616,6 +616,21 @@ public final class ComboPooledDataSource extends AbstractPoolBackedDataSource im
throw new IOException("Unsupported Serialized Version: " + version);
}
}
@@ -24,11 +24,11 @@ index d86ff2d..7b65881 100644
}
//now, referenceability happens exactly the same way it does for PoolBackedDataSource
-diff --git src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
-index 8e604c4..7adad84 100644
---- src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
-+++ src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
-@@ -256,4 +256,19 @@
+diff --git a/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java b/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
+index 1862741..5f55a48 100644
+--- a/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
+@@ -268,4 +268,19 @@ public final class DriverManagerDataSource extends DriverManagerDataSourceBase i
throw new IOException("Unsupported Serialized Version: " + version);
}
}
@@ -48,11 +48,11 @@ index 8e604c4..7adad84 100644
+ }
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
-index c1c7d47..0a0cf34 100644
---- src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
-+++ src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
-@@ -165,5 +165,25 @@
+diff --git a/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java b/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
+index e134552..548f32d 100644
+--- a/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
+@@ -177,5 +177,25 @@ final class JndiRefForwardingDataSource extends JndiRefDataSourceBase implements
throw new IOException("Unsupported Serialized Version: " + version);
}
}
@@ -78,11 +78,11 @@ index c1c7d47..0a0cf34 100644
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
-index 8520bd9..f6d93cd 100644
---- src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
-+++ src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
-@@ -23,6 +23,8 @@
+diff --git a/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java b/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
+index 8ec1ba7..f7d5a15 100644
+--- a/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
+@@ -35,6 +35,8 @@
package com.mchange.v2.c3p0;
@@ -91,10 +91,10 @@ index 8520bd9..f6d93cd 100644
import com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource;
public final class PoolBackedDataSource extends AbstractPoolBackedDataSource implements PooledDataSource
-@@ -35,5 +37,20 @@
-
- public PoolBackedDataSource(String configName)
- { super( configName ); }
+@@ -50,5 +52,20 @@ public final class PoolBackedDataSource extends AbstractPoolBackedDataSource imp
+ this();
+ initializeNamedConfig( configName, false );
+ }
+
+ public boolean isWrapperFor( Class iface )
+ {
@@ -112,11 +112,11 @@ index 8520bd9..f6d93cd 100644
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
-index 984a07d..8c736ce 100644
---- src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
-+++ src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
-@@ -831,7 +831,7 @@
+diff --git a/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java b/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
+index 334737a..b78e6c0 100644
+--- a/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
++++ b/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
+@@ -908,7 +908,7 @@ public abstract class JdbcProxyGenerator extends DelegatorGenerator
}
// end-premature-detach-debug-only!
@@ -125,7 +125,7 @@ index 984a07d..8c736ce 100644
}
iw.downIndent();
iw.println("}");
-@@ -845,10 +845,10 @@
+@@ -922,10 +922,10 @@ public abstract class JdbcProxyGenerator extends DelegatorGenerator
iw.println("{");
iw.upIndent();
//iw.println( "exc.printStackTrace();" );
@@ -138,11 +138,11 @@ index 984a07d..8c736ce 100644
iw.downIndent();
iw.println("}");
}
-diff --git src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
-index 78336bd..fd20ab2 100644
---- src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
-+++ src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
-@@ -24,6 +24,8 @@
+diff --git a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
+index 5c6a4bc..ce0507e 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
++++ b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
+@@ -36,6 +36,8 @@
package com.mchange.v2.c3p0.impl;
import java.lang.reflect.*;
@@ -151,7 +151,7 @@ index 78336bd..fd20ab2 100644
import java.sql.*;
import java.util.*;
import javax.sql.*;
-@@ -521,6 +523,7 @@
+@@ -533,6 +535,7 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
private static class StatementProxyingSetManagedResultSet extends SetManagedResultSet
{
private Statement proxyStatement;
@@ -159,7 +159,7 @@ index 78336bd..fd20ab2 100644
StatementProxyingSetManagedResultSet(Set activeResultSets)
{ super( activeResultSets ); }
-@@ -530,6 +533,273 @@
+@@ -542,6 +545,181 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
public Statement getStatement() throws SQLException
{ return (proxyStatement == null ? super.getStatement() : proxyStatement); }
@@ -185,234 +185,142 @@ index 78336bd..fd20ab2 100644
+ }
+
+ public void updateNClob( String column, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNClob( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNClob( String s, NClob nc ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNClob( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNClob( int i, NClob nc ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateClob( String s, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateClob( String s, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateClob( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateClob( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBlob( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBlob( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBlob( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBlob( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateCharacterStream( String s, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateCharacterStream( String s, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateCharacterStream( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateCharacterStream( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBinaryStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBinaryStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBinaryStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateBinaryStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateAsciiStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateAsciiStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateAsciiStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateAsciiStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNCharacterStream( String s, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNCharacterStream( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateSQLXML( String s, SQLXML sx ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateSQLXML( int i, SQLXML sx ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNString( String label, String value ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateNString( int i, String value ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateRowId( String s, RowId x ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void updateRowId( int i, RowId x ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getNCharacterStream( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getNCharacterStream( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public String getNString( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public String getNString( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public SQLXML getSQLXML( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public SQLXML getSQLXML( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public NClob getNClob( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public NClob getNClob( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public RowId getRowId( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public RowId getRowId( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public synchronized void close() throws SQLException
+ {
@@ -433,7 +341,7 @@ index 78336bd..fd20ab2 100644
}
/*
-@@ -636,6 +906,7 @@
+@@ -648,6 +826,7 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
class ProxyCallableStatement extends FilterCallableStatement implements C3P0ProxyStatement
{
WrapperStatementHelper wsh;
@@ -441,7 +349,7 @@ index 78336bd..fd20ab2 100644
ProxyCallableStatement(CallableStatement is)
{
-@@ -663,7 +934,317 @@
+@@ -675,7 +854,207 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
{ return wsh.doRawStatementOperation( m, target, args); }
public void close() throws SQLException
@@ -484,283 +392,173 @@ index 78336bd..fd20ab2 100644
+ }
+
+ public void setNClob( String parameter, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( String s, NClob nc ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( int i, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( int i, NClob nc ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( String s, Blob b ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( int i, Blob b ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( String s, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( String s, Clob c ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( int i, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setClob( int i, Clob c ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNCharacterStream( String s, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNCharacterStream( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setCharacterStream( String s, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setCharacterStream( String s, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setCharacterStream( int i, Reader r, int l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( int i, InputStream inp, int l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( int i, InputStream inp, int l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNString( String name, String value ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNString( int i, String value ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setSQLXML( String s, SQLXML sx ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setSQLXML( int i, SQLXML sx ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setRowId( String s, RowId r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setRowId( int i, RowId r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getCharacterStream( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getCharacterStream( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getNCharacterStream( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public Reader getNCharacterStream( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public String getNString( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public String getNString( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public SQLXML getSQLXML( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public SQLXML getSQLXML( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public NClob getNClob( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public NClob getNClob( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public RowId getRowId( String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public RowId getRowId( int i ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
}
return new ProxyCallableStatement((CallableStatement) innerStmt );
-@@ -673,6 +1254,7 @@
+@@ -685,6 +1064,7 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
class ProxyPreparedStatement extends FilterPreparedStatement implements C3P0ProxyStatement
{
WrapperStatementHelper wsh;
@@ -768,7 +566,7 @@ index 78336bd..fd20ab2 100644
ProxyPreparedStatement(PreparedStatement ps)
{
-@@ -700,7 +1282,133 @@
+@@ -712,7 +1092,97 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
{ return wsh.doRawStatementOperation( m, target, args); }
public void close() throws SQLException
@@ -811,99 +609,63 @@ index 78336bd..fd20ab2 100644
+ return true;
+ }
+
-+ public void setNClob( int parameter, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setNClob( int i, Reader r ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setNClob( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setNClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNClob( int i, NClob nc ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBlob( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setClob( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setClob( int i, Reader r ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setClob( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setNCharacterStream( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setNCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setCharacterStream( int i, Reader reader ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setCharacterStream( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setBinaryStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setAsciiStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setSQLXML( int i, SQLXML sx ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setNString( int i, String s ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
+ public void setRowId( int i, RowId r ) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
}
return new ProxyPreparedStatement((PreparedStatement) innerStmt );
-@@ -710,6 +1418,7 @@
+@@ -722,6 +1192,7 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
class ProxyStatement extends FilterStatement implements C3P0ProxyStatement
{
WrapperStatementHelper wsh;
@@ -911,7 +673,7 @@ index 78336bd..fd20ab2 100644
ProxyStatement(Statement s)
{
-@@ -734,7 +1443,40 @@
+@@ -746,7 +1217,40 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
{ return wsh.doRawStatementOperation( m, target, args); }
public void close() throws SQLException
@@ -953,90 +715,29 @@ index 78336bd..fd20ab2 100644
}
return new ProxyStatement( innerStmt );
-@@ -1187,11 +1929,15 @@
+@@ -1199,6 +1703,17 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
logger.log(MLevel.WARNING, "Broken Connection Close Error. ", e);
}
}
--}
-
++
+// stub methods, required by javax.sql.PooledConnection since 1.6
+ public void addStatementEventListener( StatementEventListener listener )
+ {
+ throw new NoSuchMethodError("stub method");
+ }
-
--
--
--
--
--
++
+ public void removeStatementEventListener( StatementEventListener listener )
+ {
+ throw new NoSuchMethodError("stub method");
+ }
-+}
-diff --git src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
-index cfe9c88..584eedc 100644
---- src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
-+++ src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
-@@ -23,21 +23,43 @@
-
- package com.mchange.v2.c3p0.impl;
+ }
--import java.beans.*;
--import java.util.*;
--import java.lang.reflect.*;
--import java.sql.*;
--import javax.sql.*;
--import com.mchange.v2.c3p0.*;
--import com.mchange.v2.c3p0.cfg.*;
--import com.mchange.v2.async.*;
--import com.mchange.v2.coalesce.*;
--import com.mchange.v1.db.sql.*;
--import com.mchange.v2.log.*;
-+import java.beans.BeanInfo;
-+import java.beans.Introspector;
-+import java.beans.PropertyDescriptor;
-+import java.lang.reflect.Method;
-+import java.sql.Connection;
-+import java.sql.DatabaseMetaData;
-+import java.sql.PreparedStatement;
-+import java.sql.ResultSet;
-+import java.sql.SQLException;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.Iterator;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.Timer;
-+
-+import javax.sql.ConnectionPoolDataSource;
-+import javax.sql.PooledConnection;
-+
-+import com.mchange.v1.db.sql.ConnectionUtils;
-+import com.mchange.v1.db.sql.ResultSetUtils;
-+import com.mchange.v1.db.sql.StatementUtils;
- import com.mchange.v1.lang.BooleanUtils;
-+import com.mchange.v2.async.ThreadPoolAsynchronousRunner;
-+import com.mchange.v2.c3p0.C3P0Registry;
-+import com.mchange.v2.c3p0.ConnectionCustomizer;
-+import com.mchange.v2.c3p0.ConnectionTester;
-+import com.mchange.v2.c3p0.cfg.C3P0Config;
-+import com.mchange.v2.coalesce.CoalesceChecker;
-+import com.mchange.v2.coalesce.Coalescer;
-+import com.mchange.v2.coalesce.CoalescerFactory;
-+import com.mchange.v2.log.MLevel;
-+import com.mchange.v2.log.MLog;
-+import com.mchange.v2.log.MLogger;
-+import com.mchange.v2.resourcepool.BasicResourcePoolFactory;
-+import com.mchange.v2.resourcepool.ResourcePoolFactory;
- import com.mchange.v2.sql.SqlUtils;
--import com.mchange.v2.resourcepool.ResourcePoolFactory;
--import com.mchange.v2.resourcepool.BasicResourcePoolFactory;
- public final class C3P0PooledConnectionPoolManager
- {
-@@ -125,11 +147,10 @@
+diff --git a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
+index bb7df37..97a8827 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
++++ b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnectionPoolManager.java
+@@ -138,11 +138,10 @@ public final class C3P0PooledConnectionPoolManager
// after the hung thread has been cleared and replaced
// (in hopes of getting the thread to terminate for
// garbage collection)
@@ -1050,11 +751,11 @@ index cfe9c88..584eedc 100644
return out;
}
-diff --git src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
-index cc83c54..604003c 100644
---- src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
-+++ src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
-@@ -777,4 +777,15 @@
+diff --git a/src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java b/src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
+index 7ad033c..281c942 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
++++ b/src/java/com/mchange/v2/c3p0/impl/NewPooledConnection.java
+@@ -832,4 +832,15 @@ public final class NewPooledConnection extends AbstractC3P0PooledConnection{
}
}
}
@@ -1070,11 +771,11 @@ index cc83c54..604003c 100644
+ throw new NoSuchMethodError("stub method");
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
-index 3411698..7d4be76 100644
---- src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
-+++ src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
-@@ -29,19 +29,289 @@
+diff --git a/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java b/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
+index 48dc25f..54be0ea 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
++++ b/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
+@@ -41,19 +41,289 @@
*/
package com.mchange.v2.c3p0.impl;
@@ -1099,7 +800,7 @@ index 3411698..7d4be76 100644
NullStatementSetManagedResultSet(ResultSet inner, Set activeResultSets)
{ super( inner, activeResultSets); }
-+
+
+public boolean isWrapperFor( Class c )
+{
+ return c.isInstance(this);
@@ -1113,7 +814,7 @@ index 3411698..7d4be76 100644
+ // should people be calling unwrap when isWrapperFor would return false
+ return null;
+}
-
++
public Statement getStatement()
{ return null; }
+
@@ -1364,15 +1065,14 @@ index 3411698..7d4be76 100644
+ throw new RuntimeException(new NoSuchMethodException("stub method"));
+}
}
-diff --git src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
-index 8dbdd2d..e9b16be 100644
---- src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
-+++ src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
-@@ -131,6 +131,54 @@
+diff --git a/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java b/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
+index 671d2dc..8c2523e 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
++++ b/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
+@@ -143,6 +143,56 @@ final class SetManagedDatabaseMetaData extends FilterDatabaseMetaData
{
return new NullStatementSetManagedResultSet( inner.getUDTs(a, b, c, d), activeResultSets );
}
--}
+
+ public boolean isWrapperFor( Class c )
+ {
@@ -1413,22 +1113,24 @@ index 8dbdd2d..e9b16be 100644
+ {
+ throw new RuntimeException(new NoSuchMethodException("stub method"));
+ }
-
++
+ public ResultSet getSchemas( String catalog, String schemaPattern )
+ {
+ throw new RuntimeException(new NoSuchMethodException("stub method"));
+ }
-
++
+ public RowIdLifetime getRowIdLifetime()
+ {
+ throw new RuntimeException(new NoSuchMethodException("stub method"));
+ }
-+}
-diff --git src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
-index a0fb051..cada2b1 100644
---- src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
-+++ src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
-@@ -24,6 +24,8 @@
+ }
+
+
+diff --git a/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java b/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
+index fc002db..248901a 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
++++ b/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
+@@ -36,6 +36,8 @@
package com.mchange.v2.c3p0.impl;
import java.sql.*;
@@ -1437,11 +1139,10 @@ index a0fb051..cada2b1 100644
import java.util.Set;
import com.mchange.v2.sql.filter.FilterResultSet;
-@@ -38,6 +40,27 @@
- {
+@@ -51,6 +53,27 @@ final class SnatchFromSetResultSet extends FilterResultSet
this.inner = inner;
activeResultSets.add( inner );
-+ }
+ }
+
+ public boolean isWrapperFor( Class c )
+ {
@@ -1462,10 +1163,11 @@ index a0fb051..cada2b1 100644
+
+ // should people be calling unwrap when isWrapperFor would return false?
+ return null;
- }
++ }
public synchronized void close() throws SQLException
-@@ -46,4 +69,245 @@
+ {
+@@ -58,4 +81,245 @@ final class SnatchFromSetResultSet extends FilterResultSet
activeResultSets.remove( inner );
inner = null;
}
@@ -1477,245 +1179,245 @@ index a0fb051..cada2b1 100644
+
+ public void updateNClob( String column, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNClob( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNClob( String s, NClob nc ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNClob( int i, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNClob( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNClob( int i, NClob nc ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateClob( String s, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateClob( String s, Reader reader, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateClob( int i, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateClob( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBlob( String s, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBlob( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBlob( int i, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBlob( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateCharacterStream( String s, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateCharacterStream( String s, Reader reader, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateCharacterStream( int i, Reader reader ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateCharacterStream( int i, Reader reader, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBinaryStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBinaryStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBinaryStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateBinaryStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateAsciiStream( String s, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateAsciiStream( String s, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateAsciiStream( int i, InputStream inp ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateAsciiStream( int i, InputStream inp, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNCharacterStream( String s, Reader r ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNCharacterStream( String s, Reader r, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNCharacterStream( int i, Reader r ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNCharacterStream( int i, Reader r, long l ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateSQLXML( String s, SQLXML sx ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateSQLXML( int i, SQLXML sx ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNString( String label, String value ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateNString( int i, String value ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateRowId( String s, RowId x ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void updateRowId( int i, RowId x ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public Reader getNCharacterStream( int i ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public Reader getNCharacterStream( String s ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public String getNString( int i ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public String getNString( String s ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public SQLXML getSQLXML( int i ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public SQLXML getSQLXML( String s ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public NClob getNClob( int i ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public NClob getNClob( String s ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public RowId getRowId( String s ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ public RowId getRowId( int i ) throws SQLFeatureNotSupportedException
+ {
-+ throw new SQLFeatureNotSupportedException();
++ throw new SQLFeatureNotSupportedException();
+ }
+
+ // stub methods - required by java.sql.ResultSet since 1.6
+ public int getHoldability()
+ {
-+ throw new RuntimeException(new NoSuchMethodException("stub method"));
++ throw new RuntimeException(new NoSuchMethodException("stub method"));
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
-index f386fc9..7b7a509 100644
---- src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
-+++ src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
-@@ -280,4 +280,24 @@
+diff --git a/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java b/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
+index 4d55da3..92c5bc3 100644
+--- a/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
+@@ -292,4 +292,24 @@ public final class FreezableDriverManagerDataSource extends DriverManagerDataSou
throw new IOException("Unsupported Serialized Version: " + version);
}
}
@@ -1740,11 +1442,11 @@ index f386fc9..7b7a509 100644
+ }
+ }
}
-diff --git src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
-index 5d72eb1..f725ffe 100644
---- src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
-+++ src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
-@@ -24,6 +24,7 @@
+diff --git a/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java b/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
+index bb6420d..f7fe4ec 100644
+--- a/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
++++ b/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
+@@ -36,6 +36,7 @@
package com.mchange.v2.c3p0.util;
import java.sql.*;
@@ -1752,7 +1454,7 @@ index 5d72eb1..f725ffe 100644
import com.mchange.v2.sql.filter.*;
public class CloseReportingConnectionWrapper extends FilterConnection
-@@ -37,4 +38,73 @@
+@@ -49,4 +50,73 @@ public class CloseReportingConnectionWrapper extends FilterConnection
new SQLWarning("Connection.close() called!").printStackTrace();
super.close();
}
diff --git a/c3p0-build-on-1.7.patch b/c3p0-build-on-1.7.patch
index 1c06bfc..b4678fa 100644
--- a/c3p0-build-on-1.7.patch
+++ b/c3p0-build-on-1.7.patch
@@ -1,260 +1,257 @@
-diff -up ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java.sav ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
---- ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java 2012-01-24 12:55:21.000000000 -0500
-@@ -597,6 +597,10 @@ public final class ComboPooledDataSource
+diff --git a/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java b/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
+index 7ebe0d5..ffa6b0c 100644
+--- a/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java
+@@ -631,6 +631,9 @@ public final class ComboPooledDataSource extends AbstractPoolBackedDataSource im
throw new SQLException("no object found");
}
}
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
}
//now, referenceability happens exactly the same way it does for PoolBackedDataSource
-diff -up ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java.sav ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
---- ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java 2012-01-24 12:55:21.000000000 -0500
-@@ -271,4 +271,9 @@ public final class DriverManagerDataSour
+diff --git a/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java b/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
+index 5f55a48..9c9bfd7 100644
+--- a/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java
+@@ -283,4 +283,7 @@ public final class DriverManagerDataSource extends DriverManagerDataSourceBase i
throw new SQLException("no object found");
}
}
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
+ }
+diff --git a/src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java b/src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java
+index 7f99557..91515ab 100644
+--- a/src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java
+@@ -319,5 +319,8 @@ public final class JndiRefConnectionPoolDataSource extends IdentityTokenResolvab
+ sb.append("]");
+ return sb.toString();
+ }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
+ }
+
+diff --git a/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java b/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
+index 548f32d..30897bc 100644
+--- a/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
+@@ -197,5 +197,8 @@ final class JndiRefForwardingDataSource extends JndiRefDataSourceBase implements
+ throw new SQLException("no object found");
+ }
+ }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
+ }
+
+diff --git a/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java b/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
+index f7d5a15..e65a4e2 100644
+--- a/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
+@@ -67,5 +67,8 @@ public final class PoolBackedDataSource extends AbstractPoolBackedDataSource imp
+ throw new SQLException("no object found");
+ }
+ }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
+ }
+
+diff --git a/src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java b/src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java
+index 6f45c9d..1174a06 100644
+--- a/src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java
+@@ -332,4 +332,7 @@ public final class WrapperConnectionPoolDataSource extends WrapperConnectionPool
+ else
+ this.connectionTester = C3P0ImplUtils.defaultConnectionTester();
+ }
+
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
}
-diff -up ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java.sav ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
---- ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java 2012-01-24 12:55:21.000000000 -0500
-@@ -800,8 +800,18 @@ public final class C3P0PooledConnection
+diff --git a/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java b/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
+index b78e6c0..c250352 100644
+--- a/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
++++ b/src/java/com/mchange/v2/c3p0/codegen/JdbcProxyGenerator.java
+@@ -1115,16 +1115,16 @@ public abstract class JdbcProxyGenerator extends DelegatorGenerator
+
+ interface JDBC4TemporaryPreparedStatementMethods
+ {
+- public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException;
+- public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException;
+- public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException;
+- public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException;
+- public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException;
+- public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException;
+- public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException;
+- public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException;
+- public void setClob(int parameterIndex, Reader reader, long length) throws SQLException;
+- public void setClob(int parameterIndex, Reader reader) throws SQLException;
++ //public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException;
++ //public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException;
++ //public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException;
++ //public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException;
++ //public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException;
++ //public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException;
++ //public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException;
++ //public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException;
++ //public void setClob(int parameterIndex, Reader reader, long length) throws SQLException;
++ //public void setClob(int parameterIndex, Reader reader) throws SQLException;
+
+ // test only
+ // public void finalize() throws Throwable;
+diff --git a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
+index ce0507e..7148a71 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
++++ b/src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java
+@@ -720,6 +720,12 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
{
throw new RuntimeException(new NoSuchMethodException("stub method"));
}
-+
-+ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
+
-+ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public Object getObject(String columnLabel, Class type) throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+
++ public Object getObject(int columnNumber, Class type) throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
}
-+
/*
- * TODO: factor all this convolution out into
- * C3P0Statement
-@@ -1245,6 +1255,22 @@ public final class C3P0PooledConnection
- {
- throw new SQLFeatureNotSupportedException();
- }
-+
-+ public void closeOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
+@@ -1055,6 +1061,18 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
+
+ public RowId getRowId( int i ) throws SQLFeatureNotSupportedException
+ { throw new SQLFeatureNotSupportedException(); }
++
++ public void closeOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public boolean isCloseOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
-+
-+ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public boolean isCloseOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
++
++ public Object getObject(String columnLabel, Class type) throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public Object getObject(int columnNumber, Class type) throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
}
return new ProxyCallableStatement((CallableStatement) innerStmt );
-@@ -1408,9 +1434,17 @@ public final class C3P0PooledConnection
- public void setRowId( int i, RowId r ) throws SQLFeatureNotSupportedException
- {
- throw new SQLFeatureNotSupportedException();
-- }
- }
+@@ -1183,6 +1201,12 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
-+ public void closeOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
+ public void setRowId( int i, RowId r ) throws SQLFeatureNotSupportedException
+ { throw new SQLFeatureNotSupportedException(); }
+
-+ public boolean isCloseOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
-+ }
++ public void closeOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+
++ public boolean isCloseOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+ }
+
return new ProxyPreparedStatement((PreparedStatement) innerStmt );
- }
- else
-@@ -1477,6 +1511,14 @@ public final class C3P0PooledConnection
+@@ -1251,6 +1275,12 @@ public final class C3P0PooledConnection extends AbstractC3P0PooledConnection
// should people be calling unwrap if isWrapperFor returns false?
return null;
}
+
-+ public void closeOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public void closeOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public boolean isCloseOnCompletion() throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public boolean isCloseOnCompletion() throws SQLException
++ { throw new SQLFeatureNotSupportedException(); }
}
return new ProxyStatement( innerStmt );
-@@ -1939,5 +1981,5 @@ public final class C3P0PooledConnection
- public void removeStatementEventListener( StatementEventListener listener )
- {
- throw new NoSuchMethodError("stub method");
-- }
-+ }
- }
-diff -up ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java.sav ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
---- ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java 2012-01-24 12:55:21.000000000 -0500
-@@ -314,4 +314,12 @@ public int getHoldability()
+diff --git a/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java b/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
+index 54be0ea..d6f6147 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
++++ b/src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java
+@@ -326,4 +326,10 @@ public int getHoldability()
{
throw new RuntimeException(new NoSuchMethodException("stub method"));
}
+
-+ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
-+
-+ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
- }
-diff -up ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java.sav ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
---- ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java 2012-01-24 12:55:21.000000000 -0500
-@@ -181,4 +181,15 @@ final class SetManagedDatabaseMetaData e
- {
- throw new RuntimeException(new NoSuchMethodException("stub method"));
- }
-+
-+ public boolean generatedKeyAlwaysReturned() throws java.sql.SQLException
-+ {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++public Object getObject(String columnLabel, Class type) throws SQLFeatureNotSupportedException
++{ throw new SQLFeatureNotSupportedException(); }
+
-+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
-+ String tableNamePattern, String columnNamePattern) throws java.sql.SQLException
-+ {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++public Object getObject(int columnNumber, Class type) throws SQLFeatureNotSupportedException
++{ throw new SQLFeatureNotSupportedException(); }
}
-diff -up ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java.sav ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
---- ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java 2012-01-24 12:55:21.000000000 -0500
-@@ -310,4 +310,12 @@ final class SnatchFromSetResultSet exten
+diff --git a/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java b/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
+index 8c2523e..4a36ed4 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
++++ b/src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java
+@@ -193,6 +193,16 @@ final class SetManagedDatabaseMetaData extends FilterDatabaseMetaData
{
throw new RuntimeException(new NoSuchMethodException("stub method"));
}
+
-+ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
-+
-+ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
++ public boolean generatedKeyAlwaysReturned() throws SQLFeatureNotSupportedException
++ {
++ throw new SQLFeatureNotSupportedException();
+ }
- }
-diff -up ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java.sav ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java
---- ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java.sav 2010-05-27 01:01:04.000000000 -0400
-+++ ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java 2012-01-24 12:55:22.000000000 -0500
-@@ -307,5 +307,9 @@ public final class JndiRefConnectionPool
- sb.append("]");
- return sb.toString();
- }
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLFeatureNotSupportedException
++ {
++ throw new SQLFeatureNotSupportedException();
+ }
}
-diff -up ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java.sav ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java
---- ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java 2012-01-24 12:55:22.000000000 -0500
-@@ -185,5 +185,9 @@ final class JndiRefForwardingDataSource
- throw new SQLException("no object found");
- }
- }
-+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
- }
-diff -up ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java.sav ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java
---- ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java 2012-01-24 12:55:22.000000000 -0500
-@@ -52,5 +52,9 @@ public final class PoolBackedDataSource
- throw new SQLException("no object found");
- }
+diff --git a/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java b/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
+index 248901a..a928dcc 100644
+--- a/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
++++ b/src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java
+@@ -322,4 +322,10 @@ final class SnatchFromSetResultSet extends FilterResultSet
+ {
+ throw new RuntimeException(new NoSuchMethodException("stub method"));
}
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public Object getObject(String columnLabel, Class type) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
++
++ public Object getObject(int columnNumber, Class type) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
}
-
-diff -up ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java.sav ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
---- ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java 2012-01-24 12:55:22.000000000 -0500
-@@ -300,4 +300,8 @@ public final class FreezableDriverManage
+diff --git a/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java b/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
+index 92c5bc3..fa5e133 100644
+--- a/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
++++ b/src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java
+@@ -312,4 +312,7 @@ public final class FreezableDriverManagerDataSource extends DriverManagerDataSou
throw new SQLException("no object found");
}
}
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
++ { throw new java.sql.SQLFeatureNotSupportedException(); }
}
-diff -up ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java.sav ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
---- ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java.sav 2012-01-24 12:55:18.000000000 -0500
-+++ ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java 2012-01-24 12:55:22.000000000 -0500
-@@ -107,4 +107,29 @@ public class CloseReportingConnectionWra
+diff --git a/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java b/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
+index f7fe4ec..0bcc76d 100644
+--- a/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
++++ b/src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java
+@@ -119,4 +119,19 @@ public class CloseReportingConnectionWrapper extends FilterConnection
{
throw new RuntimeException(new NoSuchMethodException("stub method"));
}
+
+ public int getNetworkTimeout() throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void abort(java.util.concurrent.Executor executor) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public String getSchema() throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
++ public void abort(java.util.concurrent.Executor executor) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public void setSchema(String schema) throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -up ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java.sav ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java
---- ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java.sav 2010-05-27 01:01:04.000000000 -0400
-+++ ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java 2012-01-24 12:55:22.000000000 -0500
-@@ -283,4 +283,8 @@ public final class WrapperConnectionPool
- else
- this.connectionTester = C3P0ImplUtils.defaultConnectionTester();
- }
++ public String getSchema() throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
+
-+ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+ throw new java.sql.SQLFeatureNotSupportedException();
-+ }
++ public void setSchema(String schema) throws SQLFeatureNotSupportedException
++ { throw new SQLFeatureNotSupportedException(); }
}
diff --git a/c3p0.pom b/c3p0.pom
index 8abdf43..8246177 100644
--- a/c3p0.pom
+++ b/c3p0.pom
@@ -3,22 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.2-pre1</version>
+ <version>0.9.2.1</version>
<packaging>jar</packaging>
<name>c3p0:JDBC DataSources/Resource Pools</name>
<description>
c3p0 is an easy-to-use library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources,
including DataSources that implement Connection and Statement Pooling, as described by the jdbc3 spec and jdbc2 std extension.
</description>
- <url>http://c3p0.sourceforge.net</url>
- <scm>
- <url>http://c3p0.cvs.sourceforge.net/c3p0</url>
- </scm>
- <licenses>
- <license>
- <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
- <url>http://www.gnu.org/licenses/lgpl.txt</url>
- </license>
- </licenses>
<dependencies/>
</project>
diff --git a/c3p0.spec b/c3p0.spec
index 00e0a95..eac27b2 100644
--- a/c3p0.spec
+++ b/c3p0.spec
@@ -1,10 +1,8 @@
-%global prerel pre1
-
Name: c3p0
-Version: 0.9.2
-Release: 0.10.%{prerel}%{?dist}
+Version: 0.9.2.1
+Release: 1%{?dist}
Summary: JDBC DataSources/Resource Pools
-License: LGPLv2
+License: LGPLv2 or EPL
URL: http://sourceforge.net/projects/c3p0
Group: Development/Libraries
@@ -18,7 +16,7 @@ Requires: java
Requires: mchange-commons
Requires: jpackage-utils
-Source0: http://download.sourceforge.net/c3p0/%{name}-%{version}-%{prerel}.src.tgz
+Source0: https://github.com/swaldman/%{name}/archive/%{name}-%{version}.tar.gz
# POM based on the one found at http://mvnrepository.com/artifact/c3p0/c3p0
Source1: c3p0.pom
@@ -41,35 +39,32 @@ extension.
Summary: API documentation for %{name}
Group: Documentation
Requires: jpackage-utils
-Requires: java-javadoc
%description javadoc
%{summary}.
%prep
-%setup -q -n %{name}-%{version}-%{prerel}.src
+%setup -q -n %{name}-%{name}-%{version}
-%patch0 -p0 -b .java6
-%patch1 -p0 -b .java7
+%patch0 -p1 -b .java6
+%patch1 -p1 -b .java7
# remove all binary bits
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
# remove manifest classpath
-sed -i.bak -e "s/<attribute\ name=\"Class-Path\"\ value=\"\${mchange-commons\.jar\.file\.name}\"\ \/>//" build.xml
+sed -i.bak -e "s/<attribute\ name=\"Class-Path\"\ value=\"\${mchange-commons-java\.jar\.file\.name}\"\ \/>//" build.xml
%build
ant \
- -Dbuild.sysclasspath=first \
- -Dmchange-commons.jar.file.dir=/usr/share/java \
- -Dmchange-commons.jar.file.name=mchange-commons.jar \
- jar javadocs
+ -Dmchange-commons-java.jar.file=`build-classpath mchange-commons-java` \
+ jar javadoc
%install
# jar
install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 build/%{name}-%{version}-%{prerel}.jar \
+install -p -m 644 build/%{name}-%{version}.jar \
%{buildroot}%{_javadir}/%{name}.jar
# javadocs
@@ -85,7 +80,7 @@ install -p -m 644 %{SOURCE1} \
%files
%doc src/dist-static/CHANGELOG
-%doc src/dist-static/LICENSE
+%doc src/dist-static/LICENSE*
%doc src/dist-static/RELEASE*
%doc src/doc/index.html
%{_mavenpomdir}/JPP-%{name}.pom
@@ -93,10 +88,14 @@ install -p -m 644 %{SOURCE1} \
%{_javadir}/%{name}.jar
%files javadoc
-%doc src/dist-static/LICENSE
+%doc src/dist-static/LICENSE*
%{_javadocdir}/%{name}
%changelog
+* Thu Mar 28 2013 Mat Booth <fedora at matbooth.co.uk> - 0.9.2.1-1
+- Update to latest upstream release
+- License change to "LGPLv2 or EPL"
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-0.10.pre1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 2966552..26fa605 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-396ccb35b2b4450ec1339511990fb383 c3p0-0.9.2-pre1.src.tgz
+07f89b8a8c66f743b3b6ebbcc8ed3b5b c3p0-0.9.2.1.tar.gz
More information about the scm-commits
mailing list