Description: Compatibility patch for compilation with OpenJDK7 due
 to changes in the JDBC API.
 .
 Also backwards compatibility with OpenJDK6.
Author: James Page <james.page@ubuntu.com>
Forwarded: no

Index: glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java
===================================================================
--- glassfish.orig/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java	2012-05-29 13:10:41.666234000 +0100
+++ glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java	2012-05-29 13:15:35.752552327 +0100
@@ -40,6 +40,8 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.DriverManager;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 import javax.sql.DataSource;
 import oracle.toplink.essentials.internal.ejb.cmp3.transaction.base.TransactionManagerImpl;
 
@@ -177,4 +179,11 @@
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return false;
     }
+
+    /*
+     * JDBC 4.1
+     */
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        throw new SQLFeatureNotSupportedException();
+    }
 }
Index: glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
===================================================================
--- glassfish.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2012-05-29 13:10:41.666234000 +0100
+++ glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2012-05-29 13:27:43.078925227 +0100
@@ -58,7 +58,8 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 import javax.sql.DataSource;
 
 import org.apache.taglibs.standard.resources.Resources;
@@ -163,5 +164,10 @@
         throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
     }
 
-
+    /*
+     * JDBC 4.1
+     */
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        throw new SQLFeatureNotSupportedException();
+    }
 }