components/tomcat/jdbc41.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Mon, 09 Mar 2015 03:42:59 -0700
branchs11-update
changeset 3923 d19fbc6076b9
parent 2602 5caab247ea3d
permissions -rw-r--r--
19668629 proftpd doesn't handle IPV6_TCLASS properly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2602
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
http://pkgs.fedoraproject.org/cgit/apache-commons-dbcp.git/tree/jdbc41.patch 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
--- src/java/org/apache/commons/dbcp/BasicDataSource.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
+++ src/java/org/apache/commons/dbcp/BasicDataSource.java	2012-02-23 09:11:04.481618663 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
@@ -24,10 +24,12 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
 import java.util.ArrayList;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
 import java.util.Iterator;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
 import java.util.Collections;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 import java.sql.Connection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 import java.sql.Driver;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 import java.sql.DriverManager;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
 import javax.sql.DataSource;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
 import org.apache.commons.pool.KeyedObjectPoolFactory;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
@@ -1579,4 +1581,10 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
             logWriter.println(message);
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2010-02-07 17:59:19.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
+++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java	2012-02-23 09:13:29.490605580 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
@@ -19,10 +19,12 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
 import java.util.Hashtable;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
 import java.util.Properties;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
 import java.io.PrintWriter;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
 import java.io.Serializable;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
 import java.sql.DriverManager;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    41
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    43
 import javax.sql.PooledConnection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    44
 import javax.sql.ConnectionPoolDataSource;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    45
 import javax.naming.Name;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    46
@@ -719,4 +721,10 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    47
     {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    48
         _maxPreparedStatements = maxPreparedStatements;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    49
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    50
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    51
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    52
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    53
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    54
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    55
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    56
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    57
diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    58
--- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    59
+++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java	2012-02-23 09:12:13.582612432 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    60
@@ -21,10 +21,12 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    61
 import java.io.ObjectInputStream;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    62
 import java.sql.Connection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    63
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    64
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    65
 import java.util.HashMap;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    66
 import java.util.Iterator;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    67
 import java.util.Map;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    68
 import java.util.NoSuchElementException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    69
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    70
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    71
 import javax.naming.NamingException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    72
 import javax.naming.Reference;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    73
@@ -561,4 +563,10 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    74
         CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    75
         return mgr == null ? null : (GenericObjectPool) mgr.getPool();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    76
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    77
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    78
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    79
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    80
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    81
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    82
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    83
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    84
diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    85
--- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    86
+++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java	2012-02-23 09:14:10.326601896 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    87
@@ -21,6 +21,8 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    88
 import java.io.ObjectInputStream;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    89
 import java.sql.Connection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    90
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    91
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    92
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    93
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    94
 import javax.naming.NamingException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    95
 import javax.naming.Reference;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    96
@@ -269,5 +271,11 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    97
             throw new IOException("NamingException: " + e);
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    98
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    99
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   100
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   101
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   102
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   103
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   104
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   105
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   106
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   107
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   108
diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   109
--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   110
+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2012-02-23 09:17:35.805583354 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   111
@@ -37,6 +37,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   112
 import java.sql.RowId;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   113
 import java.sql.SQLXML;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   114
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   115
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   116
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   117
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   118
  * A base delegating implementation of {@link CallableStatement}.
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   119
@@ -661,4 +662,14 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   120
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   121
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   122
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   123
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   124
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   125
+    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   126
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   127
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   128
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   129
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   130
+    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   131
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   132
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   133
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   134
diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   135
--- src/java/org/apache/commons/dbcp/DelegatingConnection.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   136
+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java	2012-02-23 09:04:56.488651873 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   137
@@ -27,6 +27,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   138
 import java.util.Iterator;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   139
 import java.util.List;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   140
 import java.util.Map;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   141
+import java.util.concurrent.Executor;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   142
 import java.sql.ResultSet;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   143
 /* JDBC_4_ANT_KEY_BEGIN */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   144
 import java.sql.Array;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   145
@@ -40,6 +41,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   146
 import java.util.Collections;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   147
 import java.util.Properties;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   148
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   149
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   150
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   151
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   152
  * A base delegating implementation of {@link Connection}.
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   153
@@ -678,5 +680,31 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   154
             return null;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   155
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   156
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   157
-/* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   158
+    /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   159
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   160
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   161
+    public int getNetworkTimeout() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   162
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   163
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   164
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   165
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   166
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   167
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   168
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   169
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   170
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   171
+    public void abort(Executor executor) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   172
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   173
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   174
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   175
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   176
+    public String getSchema() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   177
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   178
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   179
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   180
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   181
+    public void setSchema(String schema) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   182
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   183
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   184
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   185
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   186
diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   187
--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   188
+++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java	2012-02-23 09:20:38.181566898 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   189
@@ -24,6 +24,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   190
 import java.sql.RowIdLifetime;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   191
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   192
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   193
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   194
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   195
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   196
  * A base delegating implementation of {@link DatabaseMetaData}.
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   197
@@ -1208,4 +1209,13 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   198
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   199
     /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   200
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   201
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   202
+    public boolean generatedKeyAlwaysReturned() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   203
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   204
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   205
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   206
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   207
+    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   208
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   209
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   210
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   211
diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   212
--- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   213
+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2012-02-23 09:04:37.793653560 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   214
@@ -34,6 +34,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   215
 import java.sql.RowId;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   216
 import java.sql.SQLXML;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   217
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   218
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   219
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   220
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   221
  * A base delegating implementation of {@link PreparedStatement}.
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   222
@@ -402,4 +403,15 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   223
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   224
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   225
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   226
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   227
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   228
+    public boolean isCloseOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   229
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   230
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   231
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   232
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   233
+    public void closeOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   234
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   235
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   236
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   237
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   238
diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   239
--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   240
+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2012-02-23 09:17:19.905584789 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   241
@@ -40,6 +40,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   242
 import java.sql.RowId;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   243
 import java.sql.SQLXML;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   244
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   245
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   246
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   247
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   248
  * A base delegating implementation of {@link ResultSet}.
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   249
@@ -1079,4 +1080,14 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   250
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   251
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   252
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   253
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   254
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   255
+    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   256
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   257
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   258
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   259
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   260
+    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   261
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   262
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   263
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   264
diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   265
--- src/java/org/apache/commons/dbcp/DelegatingStatement.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   266
+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java	2012-02-23 09:04:41.171653252 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   267
@@ -22,6 +22,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   268
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   269
 import java.sql.SQLWarning;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   270
 import java.sql.Statement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   271
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   272
 import java.util.List;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   273
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   274
 /**
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   275
@@ -386,4 +387,15 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   276
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   277
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   278
 /* JDBC_4_ANT_KEY_END */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   279
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   280
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   281
+    public boolean isCloseOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   282
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   283
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   284
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   285
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   286
+    public void closeOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   287
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   288
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   289
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   290
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   291
diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   292
--- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   293
+++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java	2012-02-23 09:17:44.514582568 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   294
@@ -21,6 +21,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   295
 import java.sql.Connection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   296
 import java.sql.ResultSet;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   297
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   298
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   299
 import java.util.List;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   300
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   301
 import org.apache.commons.pool.KeyedObjectPool;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   302
@@ -123,4 +124,13 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   303
         super.passivate();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   304
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   305
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   306
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   307
+    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   308
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   309
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   310
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   311
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   312
+    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   313
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   314
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   315
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   316
diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   317
--- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   318
+++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java	2012-02-23 09:16:01.670591848 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   319
@@ -21,6 +21,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   320
 import java.sql.PreparedStatement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   321
 import java.sql.ResultSet;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   322
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   323
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   324
 import java.util.List;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   325
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   326
 import org.apache.commons.pool.KeyedObjectPool;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   327
@@ -137,4 +138,14 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   328
         super.passivate();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   329
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   330
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   331
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   332
+    public boolean isCloseOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   333
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   334
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   335
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   336
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   337
+    public void closeOnCompletion() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   338
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   339
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   340
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   341
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   342
diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   343
--- src/java/org/apache/commons/dbcp/PoolingConnection.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   344
+++ src/java/org/apache/commons/dbcp/PoolingConnection.java	2012-02-23 09:08:08.716634524 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   345
@@ -21,8 +21,10 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   346
 import java.sql.Connection;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   347
 import java.sql.PreparedStatement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   348
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   349
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   350
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   351
 import java.util.NoSuchElementException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   352
+import java.util.concurrent.Executor;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   353
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   354
 import org.apache.commons.pool.KeyedObjectPool;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   355
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   356
@@ -455,4 +457,30 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   357
             return buf.toString();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   358
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   359
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   360
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   361
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   362
+    public int getNetworkTimeout() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   363
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   364
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   365
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   366
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   367
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   368
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   369
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   370
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   371
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   372
+    public void abort(Executor executor) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   373
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   374
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   375
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   376
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   377
+    public String getSchema() throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   378
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   379
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   380
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   381
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   382
+    public void setSchema(String schema) throws SQLException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   383
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   384
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   385
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   386
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   387
diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   388
--- src/java/org/apache/commons/dbcp/PoolingDataSource.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   389
+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java	2012-02-23 09:11:31.873616194 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   390
@@ -23,10 +23,12 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   391
 import java.sql.DatabaseMetaData;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   392
 import java.sql.PreparedStatement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   393
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   394
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   395
 import java.sql.SQLWarning;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   396
 import java.sql.Statement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   397
 import java.util.Map;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   398
 import java.util.NoSuchElementException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   399
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   400
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   401
 import javax.sql.DataSource;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   402
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   403
@@ -437,4 +439,9 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   404
             }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   405
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   406
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   407
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   408
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   409
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   410
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   411
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   412
 }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   413
diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   414
--- src/java/org/apache/commons/dbcp/PoolingDriver.java	2010-02-07 17:59:20.000000000 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   415
+++ src/java/org/apache/commons/dbcp/PoolingDriver.java	2012-02-23 09:14:12.193601726 +0100
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   416
@@ -27,6 +27,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   417
 import java.sql.DriverPropertyInfo;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   418
 import java.sql.PreparedStatement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   419
 import java.sql.SQLException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   420
+import java.sql.SQLFeatureNotSupportedException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   421
 import java.sql.SQLWarning;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   422
 import java.sql.Statement;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   423
 import java.util.HashMap;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   424
@@ -34,6 +35,7 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   425
 import java.util.NoSuchElementException;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   426
 import java.util.Properties;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   427
 import java.util.Set;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   428
+import java.util.logging.Logger;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   429
 
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   430
 import org.apache.commons.jocl.JOCLContentHandler;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   431
 import org.apache.commons.pool.ObjectPool;
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   432
@@ -496,4 +498,10 @@
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   433
             }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   434
         }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   435
     }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   436
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   437
+    /* This functionality is not implemented yet */
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   438
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   439
+        throw new SQLFeatureNotSupportedException();
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   440
+    }
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   441
+
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   442
 }