Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-java/servletapi
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-02-04 14:52:50 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-02-04 14:52:50 +0000
commit549c965f59e691ac8c5a93db37e2d9ff58e9e1fb (patch)
tree185f10f91c37cb7f269c24cc4b3652692d4f11de /dev-java/servletapi
parentRemoved old ebuild. (diff)
downloadgentoo-2-549c965f59e691ac8c5a93db37e2d9ff58e9e1fb.tar.gz
gentoo-2-549c965f59e691ac8c5a93db37e2d9ff58e9e1fb.tar.bz2
gentoo-2-549c965f59e691ac8c5a93db37e2d9ff58e9e1fb.zip
patch by sejo
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-java/servletapi')
-rw-r--r--dev-java/servletapi/ChangeLog8
-rw-r--r--dev-java/servletapi/Manifest9
-rw-r--r--dev-java/servletapi/files/digest-servletapi-2.4-r11
-rw-r--r--dev-java/servletapi/files/gentoo-servletapi-2.4-patch89
-rw-r--r--dev-java/servletapi/servletapi-2.4-r1.ebuild53
5 files changed, 156 insertions, 4 deletions
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index ea76edb2e377..28fc21ec89c3 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/servletapi
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.22 2005/01/26 21:49:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.23 2005/02/04 14:52:50 axxo Exp $
+
+*servletapi-2.4-r1 (04 Feb 2005)
+
+ 04 Feb 2005; Thomas Matthijs <axxo@gentoo.org>
+ +files/gentoo-servletapi-2.4-patch, +servletapi-2.4-r1.ebuild:
+ patch by sejo
26 Jan 2005; Markus Rothe <corsair@gentoo.org> servletapi-2.3-r1.ebuild:
Stable on ppc64
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index f876021e928d..c3d1681e4bed 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,8 +1,11 @@
+MD5 7231cb526fdf568aae91f258d48e795c servletapi-2.2-r1.ebuild 1004
+MD5 a735b2b35d9c0e6a17e547e5c4543ccd servletapi-2.4-r1.ebuild 1404
+MD5 1a6db2070be14c04900039d93172f3e8 servletapi-2.4.ebuild 1326
MD5 af545433058a822ea20b49d0e8072a24 ChangeLog 3081
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7231cb526fdf568aae91f258d48e795c servletapi-2.2-r1.ebuild 1004
MD5 c1b99ed1c3bd447cef170149a9363f4d servletapi-2.3-r1.ebuild 965
-MD5 1a6db2070be14c04900039d93172f3e8 servletapi-2.4.ebuild 1326
+MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4 78
+MD5 9a8f107226db82b54f939c300a6d68e5 files/gentoo-servletapi-2.4-patch 4281
MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2-r1 74
MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3-r1 75
-MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4 78
+MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4-r1 78
diff --git a/dev-java/servletapi/files/digest-servletapi-2.4-r1 b/dev-java/servletapi/files/digest-servletapi-2.4-r1
new file mode 100644
index 000000000000..fbefd200c037
--- /dev/null
+++ b/dev-java/servletapi/files/digest-servletapi-2.4-r1
@@ -0,0 +1 @@
+MD5 3555d6ee9374cf2afd2c01b72f71969a jakarta-tomcat-5.0.19-src.tar.gz 3645543
diff --git a/dev-java/servletapi/files/gentoo-servletapi-2.4-patch b/dev-java/servletapi/files/gentoo-servletapi-2.4-patch
new file mode 100644
index 000000000000..140fa7ebf856
--- /dev/null
+++ b/dev-java/servletapi/files/gentoo-servletapi-2.4-patch
@@ -0,0 +1,89 @@
+diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp
+--- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp 2004-02-14 11:26:44.000000000 +0100
++++ jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp 2005-02-04 15:32:05.474146784 +0100
+@@ -1,3 +1,4 @@
++<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+ <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+
+ <html>
+@@ -15,7 +16,7 @@
+ <blockquote>
+ <u><b>Change Parameter</b></u>
+ <form action="functions.jsp" method="GET">
+- foo = <input type="text" name="foo" value="${param['foo']}">
++ foo = <input type="text" name="foo" value="${fn:escapeXml(param['foo'])}">
+ <input type="submit">
+ </form>
+ <br>
+@@ -27,19 +28,19 @@
+ </thead>
+ <tr>
+ <td>\${param["foo"]}</td>
+- <td>${param["foo"]}&nbsp;</td>
++ <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
+ </tr>
+ <tr>
+ <td>\${my:reverse(param["foo"])}</td>
+- <td>${my:reverse(param["foo"])}&nbsp;</td>
++ <td>${my:reverse(fn:escapeXml(param["foo"]))}&nbsp;</td>
+ </tr>
+ <tr>
+ <td>\${my:reverse(my:reverse(param["foo"]))}</td>
+- <td>${my:reverse(my:reverse(param["foo"]))}&nbsp;</td>
++ <td>${my:reverse(my:reverse(fn:escapeXml(param["foo"])))}&nbsp;</td>
+ </tr>
+ <tr>
+ <td>\${my:countVowels(param["foo"])}</td>
+- <td>${my:countVowels(param["foo"])}&nbsp;</td>
++ <td>${my:countVowels(fn:escapeXml(param["foo"]))}&nbsp;</td>
+ </tr>
+ </table>
+ </code>
+diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp
+--- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp 2004-02-14 11:26:44.000000000 +0100
++++ jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp 2005-02-04 15:32:14.639753400 +0100
+@@ -1,3 +1,4 @@
++<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+ <html>
+ <head>
+ <title>JSP 2.0 Expression Language - Implicit Objects</title>
+@@ -34,7 +35,7 @@
+ <blockquote>
+ <u><b>Change Parameter</b></u>
+ <form action="implicit-objects.jsp" method="GET">
+- foo = <input type="text" name="foo" value="${param["foo"]}">
++ foo = <input type="text" name="foo" value="fn:escapeXml(${param["foo"])}">
+ <input type="submit">
+ </form>
+ <br>
+@@ -46,11 +47,11 @@
+ </thead>
+ <tr>
+ <td>\${param.foo}</td>
+- <td>${param.foo}&nbsp;</td>
++ <td>fn:escapeXml(${param.foo})&nbsp;</td>
+ </tr>
+ <tr>
+ <td>\${param["foo"]}</td>
+- <td>${param["foo"]}&nbsp;</td>
++ <td>fn:escapeXml(${param["foo"])}&nbsp;</td>
+ </tr>
+ <tr>
+ <td>\${header["host"]}</td>
+diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx
+--- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx 2004-02-14 11:26:44.000000000 +0100
++++ jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx 2005-02-04 15:34:24.910949168 +0100
+@@ -6,11 +6,12 @@
+ <svg xmlns="http://www.w3.org/2000/svg"
+ width="450" height="500" viewBox="0 0 450 500"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
++ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:jsp="http://java.sun.com/JSP/Page">
+ <jsp:directive.page contentType="image/svg+xml" />
+ <title>JSP 2.0 JSPX</title>
+ <!-- select name parameter, or default to JSPX -->
+- <c:set var="name" value='${empty param["name"] ? "JSPX" : param["name"]}'/>
++ <c:set var="name" value='${empty fn:escapeXml(param["name"]) ? "JSPX" : fn:escapeXml(param["name"])}'/>
+ <g id="testContent">
+ <text class="title" x="50%" y="10%" font-size="15" text-anchor="middle" >
+ JSP 2.0 XML Syntax (.jspx) Demo</text>
diff --git a/dev-java/servletapi/servletapi-2.4-r1.ebuild b/dev-java/servletapi/servletapi-2.4-r1.ebuild
new file mode 100644
index 000000000000..28e427c9919a
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r1.ebuild,v 1.1 2005/02/04 14:52:50 axxo Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Servlet API 5 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://apache/jakarta/tomcat-5/v5.0.19/src/jakarta-tomcat-5.0.19-src.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+ >=dev-java/ant-1.5
+ jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jdk-1.4"
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="x86 ~sparc ppc amd64 ~ppc64"
+IUSE="jikes doc"
+
+S=${WORKDIR}/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/gentoo-${P}-patch
+}
+
+src_compile() {
+ antflags="jar"
+ use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ use doc && antflags="${antflags} javadoc examples"
+ ant ${antflags} -f jsr154/build.xml || die "compilation problem"
+ ant ${antflags} -f jsr152/build.xml || die "compilation problem"
+}
+
+src_install () {
+ mv jsr{154,152}/dist/lib/*.jar ${S}
+
+ if use doc ; then
+ mkdir docs
+ cd ${S}/jsr154/dist
+ mv docs ${S}/docs/servlet
+ mv examples ${S}/docs/servlet/examples
+
+ cd ${S}/jsr152/dist
+ mv docs ${S}/docs/jsp
+ mv examples ${S}/docs/jsp/examples
+ fi
+
+ cd ${S}
+ java-pkg_dojar *.jar || die "Unable to install"
+ use doc && java-pkg_dohtml -r docs/*
+}
+