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

Torsten Werner twerner at alioth.debian.org
Sun May 16 22:22:24 UTC 2010 

Author: twerner
Date: 2010-05-16 22:22:23 +0000 (Sun, 16 May 2010)
New Revision: 12439

Added:
   trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch
   trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch
   trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch
Removed:
   trunk/glassfish/debian/patches/appserv.diff
   trunk/glassfish/debian/patches/jstl.diff
   trunk/glassfish/debian/patches/properties.diff
Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/patches/series
Log:
UNRELEASED (FTBFS: javax.management.j2ee.statistics.Stats missing)
* Convert patches to dep3 format.

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2010-05-16 22:07:16 UTC (rev 12438)
+++ trunk/glassfish/debian/changelog	2010-05-16 22:22:23 UTC (rev 12439)
@@ -1,10 +1,11 @@
 glassfish (1:2.1.1-b31-1) unstable; urgency=low
 
-  UNRELEASED
+  UNRELEASED (FTBFS: javax.management.j2ee.statistics.Stats missing)
   * New upstream release
   * Update debian/watch for release 2.1.1.
+  * Convert patches to dep3 format.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 17 May 2010 00:01:28 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 17 May 2010 00:18:36 +0200
 
 glassfish (1:2ur2-b04-6) unstable; urgency=low
 

Added: trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch
===================================================================
--- trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch	                        (rev 0)
+++ trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch	2010-05-16 22:22:23 UTC (rev 12439)
@@ -0,0 +1,26 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:20 +0200
+Subject: [PATCH] Fix appserv-api build
+
+---
+ appserv-api/build.xml |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/appserv-api/build.xml b/appserv-api/build.xml
+index f798d26..0c7eaab 100644
+--- a/appserv-api/build.xml
++++ b/appserv-api/build.xml
+@@ -86,9 +86,10 @@
+                 source="${javac.source}"
+                 deprecation="${javac.deprecation}"
+                 failonerror="true">
+-            <classpath refid="compile.classpath"/>
++            <classpath>
++                <pathelement location="${javaee.jar}"/>
++            </classpath>
+             <include name="**/*.java"/>
+-	    <compilerarg line="-Xlint:unchecked,fallthrough,serial,finally"/>
+         </javac>
+     </target>
+ 
+-- 

Added: trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch
===================================================================
--- trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch	                        (rev 0)
+++ trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch	2010-05-16 22:22:23 UTC (rev 12439)
@@ -0,0 +1,24 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:22 +0200
+Subject: [PATCH] Fix glassfish.root directory
+
+---
+ bootstrap/project.properties |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bootstrap/project.properties b/bootstrap/project.properties
+index a7e9d70..8fc4177 100644
+--- a/bootstrap/project.properties
++++ b/bootstrap/project.properties
+@@ -46,8 +46,8 @@ glassfish.cvsroot=:pserver:${glassfish.cvs.username}@cvs.dev.java.net:/cvs
+ glassfish.cvstag=SJSAS91_FCS_BRANCH
+ glassfish.cvs.project=glassfish
+ glassfish.cvs.module=bootstrap
+-glassfish.root=${basedir}/../..
+-glassfish.maven=${glassfish.root}/${glassfish.cvs.project}/${glassfish.cvs.module}
++glassfish.root=${basedir}/..
++glassfish.maven=${glassfish.root}/${glassfish.cvs.module}
+ 
+ # You MUST use absolute path
+ glassfish.home=${glassfish.root}/publish/glassfish
+-- 

Added: trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch
===================================================================
--- trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch	                        (rev 0)
+++ trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch	2010-05-16 22:22:23 UTC (rev 12439)
@@ -0,0 +1,33 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:23 +0200
+Subject: [PATCH] Disable SQL exceptions
+
+---
+ .../standard/tag/common/sql/DataSourceWrapper.java |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+index 486276b..8fcb5ae 100644
+--- a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
++++ b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+@@ -149,5 +149,19 @@ public class DataSourceWrapper implements DataSource {
+         throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
+     }
+ 
++    /**
++     * Always throws a SQLException. Not supported.
++     */
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
++    }
++
++    /**
++     * Always throws a SQLException. Not supported.
++     */
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
++    }
++
+ 
+ }
+-- 

Deleted: trunk/glassfish/debian/patches/appserv.diff
===================================================================
--- trunk/glassfish/debian/patches/appserv.diff	2010-05-16 22:07:16 UTC (rev 12438)
+++ trunk/glassfish/debian/patches/appserv.diff	2010-05-16 22:22:23 UTC (rev 12439)
@@ -1,18 +0,0 @@
-Description: Fix appserv-api build
-Index: glassfish-2ur2-b04/appserv-api/build.xml
-===================================================================
---- glassfish-2ur2-b04.orig/appserv-api/build.xml	2010-02-17 22:42:49.000000000 -0500
-+++ glassfish-2ur2-b04/appserv-api/build.xml	2010-02-17 22:44:55.000000000 -0500
-@@ -86,9 +86,10 @@
-                 source="${javac.source}"
-                 deprecation="${javac.deprecation}"
-                 failonerror="true">
--            <classpath refid="compile.classpath"/>
-+            <classpath>
-+                <pathelement location="${javaee.jar}"/>
-+            </classpath>
-             <include name="**/*.java"/>
--	    <compilerarg line="-Xlint:unchecked,fallthrough,serial,finally"/>
-         </javac>
-     </target>
- 

Deleted: trunk/glassfish/debian/patches/jstl.diff
===================================================================
--- trunk/glassfish/debian/patches/jstl.diff	2010-05-16 22:07:16 UTC (rev 12438)
+++ trunk/glassfish/debian/patches/jstl.diff	2010-05-16 22:22:23 UTC (rev 12439)
@@ -1,25 +0,0 @@
-Description: Disable SQL exceptions.
-Index: glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
-===================================================================
---- glassfish-2ur2-b04.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2007-05-05 22:17:53.000000000 -0400
-+++ glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2010-02-17 22:26:45.000000000 -0500
-@@ -133,5 +133,19 @@
-         throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-     }
- 
-+    /**
-+     * Always throws a SQLException. Not supported.
-+     */
-+    public <T> T unwrap(Class<T> iface) throws SQLException {
-+        throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-+    }
-+
-+    /**
-+     * Always throws a SQLException. Not supported.
-+     */
-+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
-+        throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-+    }
-+
- 
- }

Deleted: trunk/glassfish/debian/patches/properties.diff
===================================================================
--- trunk/glassfish/debian/patches/properties.diff	2010-05-16 22:07:16 UTC (rev 12438)
+++ trunk/glassfish/debian/patches/properties.diff	2010-05-16 22:22:23 UTC (rev 12439)
@@ -1,16 +0,0 @@
-Description: Fix glassfish.root directory
-Index: glassfish-2ur2-b04/bootstrap/project.properties
-===================================================================
---- glassfish-2ur2-b04.orig/bootstrap/project.properties	2008-04-11 12:55:29.000000000 -0400
-+++ glassfish-2ur2-b04/bootstrap/project.properties	2010-02-17 22:26:38.000000000 -0500
-@@ -46,8 +46,8 @@
- glassfish.cvstag=SJSAS91_UR2_BRANCH
- glassfish.cvs.project=glassfish
- glassfish.cvs.module=bootstrap
--glassfish.root=${basedir}/../..
--glassfish.maven=${glassfish.root}/${glassfish.cvs.project}/${glassfish.cvs.module}
-+glassfish.root=${basedir}/..
-+glassfish.maven=${glassfish.root}/${glassfish.cvs.module}
- 
- # You MUST use absolute path
- glassfish.home=${glassfish.root}/publish/glassfish

Modified: trunk/glassfish/debian/patches/series
===================================================================
--- trunk/glassfish/debian/patches/series	2010-05-16 22:07:16 UTC (rev 12438)
+++ trunk/glassfish/debian/patches/series	2010-05-16 22:22:23 UTC (rev 12439)
@@ -1,4 +1,3 @@
-appserv.diff
-properties.diff
-jstl.diff
-
+0001-Fix-appserv-api-build.patch
+0002-Fix-glassfish.root-directory.patch
+0003-Disable-SQL-exceptions.patch

More information about the pkg-java-commits mailing list