[pkg-java] r16076 - in trunk/glassfish/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-05-29 23:18:56 +0000 (Tue, 29 May 2012)
New Revision: 16076

Added:
   trunk/glassfish/debian/patches/java7-compat.patch
Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/patches/series
Log:
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888938):
  - d/patches/java7-compat.patch: compatibility patch for compilation
    with Java 7 API's. (Closes: #675038).
* Upload to unstable.

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2012-05-29 23:10:30 UTC (rev 16075)
+++ trunk/glassfish/debian/changelog	2012-05-29 23:18:56 UTC (rev 16076)
@@ -1,3 +1,15 @@
+glassfish (1:2.1.1-b31g-3) unstable; urgency=low
+
+  [ James Page ]
+  * Fix FTBFS with openjdk-7 as default-jdk (LP: #888938):
+    - d/patches/java7-compat.patch: compatibility patch for compilation
+      with Java 7 API's. (Closes: #675038).
+
+  [ Damien Raude-Morvan ]
+  * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 May 2012 01:07:41 +0200
+
 glassfish (1:2.1.1-b31g-2) unstable; urgency=low
 
   * Install POM and jar for Jmac API into maven-repo.

Added: trunk/glassfish/debian/patches/java7-compat.patch
===================================================================
--- trunk/glassfish/debian/patches/java7-compat.patch	                        (rev 0)
+++ trunk/glassfish/debian/patches/java7-compat.patch	2012-05-29 23:18:56 UTC (rev 16076)
@@ -0,0 +1,58 @@
+Description: Compatibility patch for compilation with OpenJDK7 due
+ to changes in the JDBC API.
+ .
+ Also backwards compatibility with OpenJDK6.
+Author: James Page <james.page at 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();
++    }
+ }

Modified: trunk/glassfish/debian/patches/series
===================================================================
--- trunk/glassfish/debian/patches/series	2012-05-29 23:10:30 UTC (rev 16075)
+++ trunk/glassfish/debian/patches/series	2012-05-29 23:18:56 UTC (rev 16076)
@@ -1,3 +1,4 @@
 0001-Fix-appserv-api-build.patch
 0002-Fix-glassfish.root-directory.patch
 0003-Disable-SQL-exceptions.patch
+java7-compat.patch