[glassfish] 16/40: Build appserv-jstl.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.

commit 837a0d4bd84803313782cae36309c9e92e6895ac
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Dec 18 12:22:53 2007 +0000

    Build appserv-jstl.
---
 debian/build.xml         |  2 +-
 debian/changelog         |  3 ++-
 debian/patches/jstl.diff | 24 ++++++++++++++++++++++++
 debian/patches/series    |  1 +
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 4768910..07e1fc1 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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"/> -->
diff --git a/debian/changelog b/debian/changelog
index fbb826e..ac51dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ glassfish (2+b58g-3) unstable; urgency=low
   * 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
 
diff --git a/debian/patches/jstl.diff b/debian/patches/jstl.diff
new file mode 100644
index 0000000..421c05b
--- /dev/null
+++ b/debian/patches/jstl.diff
@@ -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"));
++    }
++
+ 
+ }
diff --git a/debian/patches/series b/debian/patches/series
index defc844..b0272e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 properties.diff
+jstl.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git