Package: glassfish Version: 1:2.1.1-b31g-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Fix FTBFS with openjdk-7 as default-jdk (LP: #888938): - d/patches/java7-compat.patch: compatibility patch for compilation with Java 7 API's. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPxM9LAAoJEL/srsug59jDzRIQAMR3lIsuPiGImq2bDBwzCYZ/ UCfSrPP83AjsNDlG2kTPDn/jVKShaGb7bZ58dRuETitpA2/BdQgQlflkpsyuQHOB ehCkSaFVDz/daID4TRWsnaYUgj3qpOmUa5Jt7vBw1TarucF6kHWrdLsMaYEjGqr3 yjRB+WoHtkl/ffWtgH9cwIh1g7IIJZ8r5gZkI4q4hi7MdwMhRbAIfo+tT8/bC/N4 1x86WxCvTLJHwrbohLeX/IcpC2E4p3iHtbMrf1wzStUxOEDwPFGiibfqJ7sP9Y/B NI9wDIOW0wU0lSWhVWTPr6LfPAbdCZlyhRqWlcm+HeIkVxRGr4J2MECrL9W5Qgar nAMdnQjcYorciP3Nt2effKjb0jdzbz7HiFLWNzCrcSYzWimmtDmuS50cytgNol4u p8Yz4N61laqPDSFOSXxWxie4n7EiFEMldayVZd6pBld0pHqEW+k4dbqL19P+15Al 6UMRQ+UEeWi9GrgbvXfZSIxsDom5kmMMXfu5YsBjhD6vDRRbEaPFFxV8jhpLKNqH 9ZEwgGEi8+f5TxtnZ+cqzwyKeBQozRlEVMBRj69SoGx/0BIaAbr0JvGhXM4p27vi FQ+o0rqVVRcgB22beQzHRBIm7oNK5LuTEBsIL5FOgX4Xmv1wWrMdM1BzlDPaMFhz oyZTfnXgiNcoDOr18las =swbS -----END PGP SIGNATURE-----
=== added file 'debian/patches/java7-compat.patch' --- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/java7-compat.patch 2012-05-29 12:35:32 +0000 @@ -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.p...@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 file 'debian/patches/series' --- debian/patches/series 2010-05-18 21:31:25 +0000 +++ debian/patches/series 2012-05-29 12:13:33 +0000 @@ -1,3 +1,4 @@ 0001-Fix-appserv-api-build.patch 0002-Fix-glassfish.root-directory.patch 0003-Disable-SQL-exceptions.patch +java7-compat.patch