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

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-18 12:22:53 +0000 (Tue, 18 Dec 2007)
New Revision: 5129

Added:
   trunk/glassfish/debian/patches/jstl.diff
Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/patches/series
Log:
Build appserv-jstl.

Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2007-12-18 12:14:49 UTC (rev 5128)
+++ trunk/glassfish/debian/build.xml	2007-12-18 12:22:53 UTC (rev 5129)
@@ -68,7 +68,7 @@
     <!-- <ant dir="../jmx-remote" target="all"/> -->
     <!-- <ant dir="../admin-core" target="all"/> -->
     <!-- <ant dir="../jts" target="all"/> -->
-    <!-- <ant dir="../appserv-jstl" target="all"/> -->
+    <ant dir="../appserv-jstl" target="all"/>
     <ant dir="../pwc-commons" target="all"/>
     <!-- <ant dir="../appserv-webtier" target="all"/> -->
     <!-- <ant dir="../webtier-extensions" target="all"/> -->

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2007-12-18 12:14:49 UTC (rev 5128)
+++ trunk/glassfish/debian/changelog	2007-12-18 12:22:53 UTC (rev 5129)
@@ -4,8 +4,9 @@
   * Remove Build-Depends: libservlet2.4-java.
   * Add Build-Depends: libaxis-java and remove wrong patch ejb.diff.
   * Change Standards-Version: 3.7.3.
+  * Build appserv-jstl.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 13:14:00 +0100
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 13:16:37 +0100
 
 glassfish (2+b58g-2) unstable; urgency=low
 

Added: trunk/glassfish/debian/patches/jstl.diff
===================================================================
--- trunk/glassfish/debian/patches/jstl.diff	                        (rev 0)
+++ trunk/glassfish/debian/patches/jstl.diff	2007-12-18 12:22:53 UTC (rev 5129)
@@ -0,0 +1,24 @@
+Index: glassfish-2+b58g/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+===================================================================
+--- glassfish-2+b58g.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2007-12-18 13:15:27.000000000 +0100
++++ glassfish-2+b58g/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java	2007-12-18 13:05:38.000000000 +0100
+@@ -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"));
++    }
++
+ 
+ }

Modified: trunk/glassfish/debian/patches/series
===================================================================
--- trunk/glassfish/debian/patches/series	2007-12-18 12:14:49 UTC (rev 5128)
+++ trunk/glassfish/debian/patches/series	2007-12-18 12:22:53 UTC (rev 5129)
@@ -1 +1,2 @@
 properties.diff
+jstl.diff