[PATCH jakarta-servletapi-5] Re: Fwd: XSS in Jakarta Tomcat 5.5.6

[Mark Thomas]

Patches to fix the minor XSS issues in the examples are below.
I would be grateful if someone with jakarta-servletapi-5 karama could 
commit these.

Cheers,
Mark
Index: jsr152/examples/jsp2/el/functions.jsp
===
RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp,v
retrieving revision 1.4
diff -u -r1.4 functions.jsp
--- jsr152/examples/jsp2/el/functions.jsp	18 Mar 2004 16:40:30 -
1.4
+++ jsr152/examples/jsp2/el/functions.jsp	20 Nov 2004 19:02:44 -
@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --
+%@ taglib prefix=fn uri=http://java.sun.com/jsp/jstl/functions; %
 %@ taglib prefix=my
uri=http://jakarta.apache.org/tomcat/jsp2-example-taglib%

 html
@@ -30,7 +31,7 @@
 blockquote
   ubChange 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
@@ -42,19 +43,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
Index: jsr152/examples/jsp2/el/implicit-objects.jsp
===
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp,v
retrieving revision 1.3
diff -u -r1.3 implicit-objects.jsp
--- jsr152/examples/jsp2/el/implicit-objects.jsp	18 Mar 2004 16:40:30
-	1.3
+++ jsr152/examples/jsp2/el/implicit-objects.jsp	20 Nov 2004 19:04:06
-
@@ -13,6 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --
+%@ taglib prefix=fn uri=http://java.sun.com/jsp/jstl/functions; %
+
 html
   head
 titleJSP 2.0 Expression Language - Implicit Objects/title
@@ -49,7 +51,7 @@
 blockquote
   ubChange 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
@@ -61,11 +63,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
Index: jsr152/examples/jsp2/jspx/textRotate.jspx
===
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx,v
retrieving revision 1.3
diff -u -r1.3 textRotate.jspx
--- jsr152/examples/jsp2/jspx/textRotate.jspx	21 Nov 2003 22:06:02 -
1.3
+++ jsr152/examples/jsp2/jspx/textRotate.jspx	20 Nov 2004 19:54:10 -
@@ -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 /
   titleJSP 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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5 schema update

[Yuta Yoshida]

Hi,

The attached file is to update the web-app_2_4.xsd according
to the JSR154 maintenance release.

jsr154/src/share/dtd/web-app_2_4.xsd

  o The restriction facet of mime-typeType should be updated
from:-
xsd:pattern value=[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+/
to:-
xsd:pattern value=[^\p{Cc}^\s]+/[^\p{Cc}^\s]+/

thank you,
Yutaka Yoshida
Sun Microsystems, Inc.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[Fwd: [PATCH] jakarta-servletapi-5 schema update]

[Yuta Yoshida]

forgot to attach...
sorry,
Yutaka Yoshida
Sun Microsystems, Inc.
 Original Message 
Subject: [PATCH] jakarta-servletapi-5 schema update
Date: Tue, 15 Jun 2004 14:56:09 -0700
From: Yuta Yoshida [EMAIL PROTECTED]
Organization: Sun Microsystems
To: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
Hi,
The attached file is to update the web-app_2_4.xsd according
to the JSR154 maintenance release.
jsr154/src/share/dtd/web-app_2_4.xsd
  o The restriction facet of mime-typeType should be updated
from:-
xsd:pattern value=[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+/
to:-
xsd:pattern value=[^\p{Cc}^\s]+/[^\p{Cc}^\s]+/
thank you,
Yutaka Yoshida
Sun Microsystems, Inc.

Index: jsr154/src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.13
diff -u -r1.13 web-app_2_4.xsd
--- jsr154/src/share/dtd/web-app_2_4.xsd18 Mar 2004 16:40:34 -  1.13
+++ jsr154/src/share/dtd/web-app_2_4.xsd15 Jun 2004 18:10:29 -
@@ -30,7 +30,7 @@
   xsd:annotation
 xsd:documentation
 
-  Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+  Copyright 2004 Sun Microsystems, Inc., 901 San Antonio
   Road, Palo Alto, California 94303, U.S.A. All rights
   reserved.
 
@@ -804,7 +804,7 @@
 
 xsd:simpleContent
   xsd:restriction base=j2ee:string
-   xsd:pattern value=[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+/
+   xsd:pattern value=[^\p{Cc}^\s]+/[^\p{Cc}^\s]+/
   /xsd:restriction
 /xsd:simpleContent
   /xsd:complexType

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: javax/servlet/http/HttpServlet.java

[Jan Luehe]

This fixes an ArrayIndexOutOfBoundsException when superclass does
not declare any methods (see Bugtraq 4968841).
Jan
[EMAIL PROTECTED]'s password: 
Warning: Remote host denied X11 forwarding, perhaps xauth program could not be run on 
the server side.
Index: jsr154/src/share/javax/servlet/http/HttpServlet.java
===
RCS file: 
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/http/HttpServlet.java,v
retrieving revision 1.7
diff -u -r1.7 HttpServlet.java
--- jsr154/src/share/javax/servlet/http/HttpServlet.java18 Mar 2004 16:40:35 
-  1.7
+++ jsr154/src/share/javax/servlet/http/HttpServlet.java8 Jun 2004 00:14:28 
-
@@ -465,36 +465,28 @@
 }
 
 
+private static Method[] getAllDeclaredMethods(Class c) {
 
+if (c.equals(javax.servlet.http.HttpServlet.class)) {
+return null;
+}
 
-
-private Method[] getAllDeclaredMethods(Class c) {
-   if (c.getName().equals(javax.servlet.http.HttpServlet))
-   return null;
-   
-   int j=0;
-   Method[] parentMethods = getAllDeclaredMethods(c.getSuperclass());
-   Method[] thisMethods = c.getDeclaredMethods();
+Method[] parentMethods = getAllDeclaredMethods(c.getSuperclass());
+Method[] thisMethods = c.getDeclaredMethods();

-   if (parentMethods!=null) {
-   Method[] allMethods =
-   new Method[parentMethods.length + thisMethods.length];
-   for (int i=0; iparentMethods.length; i++) {
-   allMethods[i]=parentMethods[i];
-   j=i;
-   }
-   j++;
-   for (int i=j; ithisMethods.length+j; i++) {
-   allMethods[i] = thisMethods[i-j];
-   }
-   return allMethods;
+if ((parentMethods != null)  (parentMethods.length  0)) {
+Method[] allMethods =
+new Method[parentMethods.length + thisMethods.length];
+   System.arraycopy(parentMethods, 0, allMethods, 0,
+ parentMethods.length);
+   System.arraycopy(thisMethods, 0, allMethods, parentMethods.length,
+ thisMethods.length);
+
+   thisMethods = allMethods;
}
+
return thisMethods;
 }
-
-
-
-
 
 
 /**

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5 jsr154 Spanish resource strings

[Larry Isaacs]

I received a number of updates for Spanish translations from
Jesús Marín.  This new file and diff are ones I don't have
karma to commit.  If someone who does would commit these,
I would appreciate it. Since I'm working on Windows, these
contain CRLF.  Please fix if you are committing from *nix.
Thanks.

Cheers,
Larry  

__
Larry Isaacs
[EMAIL PROTECTED]
Java Development Environment
SAS Institute Inc.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: [PATCH] jakarta-servletapi-5 jsr154 Spanish resource strings

[Larry Isaacs]

Forgot that the attachments don't come through.  I'll
attach them to:

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26039

Cheers,
Larry


-Original Message-
From: Larry Isaacs [mailto:[EMAIL PROTECTED] 
Sent: Friday, January 16, 2004 10:13 PM
To: [EMAIL PROTECTED]
Subject: [PATCH] jakarta-servletapi-5 jsr154 Spanish resource strings


I received a number of updates for Spanish translations from
Jesús Marín.  This new file and diff are ones I don't have
karma to commit.  If someone who does would commit these,
I would appreciate it. Since I'm working on Windows, these
contain CRLF.  Please fix if you are committing from *nix.
Thanks.

Cheers,
Larry  

__
Larry Isaacs
[EMAIL PROTECTED]
Java Development Environment
SAS Institute Inc.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH][jakarta-servletapi-5/jsr152] Upgrade to JSTL 1.1

[Jan Luehe]

Patch is attached.

Also, please update jstl.jar and standard.jar in

  jakarta-servletapi-5/jsr152/examples/WEB-INF/lib

with their JSTL-1.1 counterparts from

http://www.tux.org/pub/net/apache/dist/jakarta/taglibs/standard/binaries/

Thanks!

Jan
Executing ssh-askpass to query the password...
Warning: Remote host denied X11 forwarding, perhaps xauth program could not be run on 
the server side.
cvs server: Diffing jakarta-servletapi-5/jsr152
cvs server: Diffing jakarta-servletapi-5/jsr152/examples
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/cal
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/checkbox
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/colors
cvs server: Diffing 
jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/compressionFilters
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/dates
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/error
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/examples
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/filters
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/jsp2
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/jsp2/examples
cvs server: Diffing 
jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/jsp2/examples/el
cvs server: Diffing 
jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/jsp2/examples/simpletag
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/listeners
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/num
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/sessions
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/util
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/validators
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/jsp
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/jsp/applet
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/jsp2
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/lib
Index: jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/jstl.jar
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/jstl.jar,v
retrieving revision 1.1
diff -u -r1.1 jstl.jar
Binary files /tmp/cvsTsksTg and jstl.jar differ
Index: jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/standard.jar
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/standard.jar,v
retrieving revision 1.1
diff -u -r1.1 standard.jar
Binary files /tmp/cvs5zNo7N and standard.jar differ
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/WEB-INF/tags
Index: jakarta-servletapi-5/jsr152/examples/WEB-INF/tags/displayProducts.tag
===
RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/examples/WEB-INF/tags/displayProducts.tag,v
retrieving revision 1.2
diff -u -r1.2 displayProducts.tag
--- jakarta-servletapi-5/jsr152/examples/WEB-INF/tags/displayProducts.tag   28 Oct 
2002 17:45:44 -  1.2
+++ jakarta-servletapi-5/jsr152/examples/WEB-INF/tags/displayProducts.tag   20 Nov 
2003 21:45:38 -
@@ -2,7 +2,7 @@
- Copyright (c) 2002 The Apache Software Foundation.  All rights 
- reserved.
 --%
-%@ taglib prefix=c uri=http://java.sun.com/jstl/core_rt; %
+%@ taglib prefix=c uri=http://java.sun.com/jsp/jstl/core; %
 %@ attribute name=normalPrice fragment=true %
 %@ attribute name=onSale fragment=true %
 %@ variable name-given=name %
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/cal
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/checkbox
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/colors
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/dates
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/error
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/forward
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/images
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/include
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/jsp2
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/jsp2/el
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/jsp2/jspattribute
cvs server: Diffing jakarta-servletapi-5/jsr152/examples/jsp2/jspx
Index: jakarta-servletapi-5/jsr152/examples/jsp2/jspx/basic.jspx
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/basic.jspx,v
retrieving revision 1.3
diff -u -r1.3 basic.jspx
--- 

Re: [PATCH] jakarta-servletapi-5: fix description

[Yuta Yoshida]

The attached file is to update the
servlet2.4 deployment descriptor schema
jsr154/src/share/dtd/web-app_2_4.xsd
Update the 'year' in the copyright
thank you,
yutaka yoshida
Sun Microsystems, Inc.
Index: jsr154/src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.12
diff -u -r1.12 web-app_2_4.xsd
--- jsr154/src/share/dtd/web-app_2_4.xsd26 Aug 2003 21:38:09 -  1.12
+++ jsr154/src/share/dtd/web-app_2_4.xsd30 Oct 2003 03:26:18 -
@@ -8,14 +8,14 @@
version=2.4
   xsd:annotation
 xsd:documentation
-  %W% %E%
+  @(#)web-app_2_4.xsds 1.60 03/08/26
 /xsd:documentation
   /xsd:annotation
 
   xsd:annotation
 xsd:documentation
 
-  Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+  Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
   Road, Palo Alto, California 94303, U.S.A. All rights
   reserved.
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: XML schema fix

[Mark Roth]

Attached is a patch to the TLD schema to remove a superfluous definition 
for the xml prefix.

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Removed superfluous xml namespace
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.14
diff -u -r1.14 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 19:58:19 - 
 1.14
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  8 Oct 2003 23:21:29 -
@@ -3,7 +3,6 @@
  targetNamespace=http://java.sun.com/xml/ns/j2ee;
  xmlns:j2ee=http://java.sun.com/xml/ns/j2ee;
  xmlns:xsd=http://www.w3.org/2001/XMLSchema;
- xmlns:xml=http://www.w3.org/XML/1998/namespace;
  elementFormDefault=qualified
  attributeFormDefault=unqualified
  version=2.0
@@ -13,10 +12,11 @@
   %W% %G%
 /xsd:documentation
   /xsd:annotation
+
   xsd:annotation
 xsd:documentation
 
-  Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+  Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
   Road, Palo Alto, California 94303, U.S.A. All rights
   reserved.
 
@@ -270,13 +270,15 @@
 
Where:
 
-   * Type is a basic type or a fully qualified Java class name
- (including package name), as per the 'Type' production
- in the Java Language Specification, Second Edition,
+   * Type is a basic type or a fully qualified
+ Java class name (including package name),
+ as per the 'Type' production in the Java
+ Language Specification, Second Edition,
  Chapter 18.
 
-* Identifier is a Java identifier, as per the 'Identifier'
- production in the Java Language Specification, Second
+* Identifier is a Java identifier, as per
+ the 'Identifier' production in the Java
+ Language Specification, Second
  Edition, Chapter 18.
 
Example:
@@ -693,8 +695,8 @@
 
The taglib tag is the document root, it defines:
 
-   description a simple string describing the use of this taglib,
-   should be user discernable
+   description a simple string describing the use of this
+   taglib, should be user discernable
 
display-namethe display-name element contains a
short name that is intended to be displayed

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5 JSP Examples improvements

[Mark Roth]

There were reports of the View Source option not working for the JSP 
examples in some versions of IE.  Apparently some configurations of IE 
will process the HTML tags in text files instead of rendering them as 
text.  I've made the following enhancements:

  * Created new ant task Txt2Html that converts text files to
escaped HTML in a 'pre' tag
  * Modified build.xml to build and import Txt2Html task
  * Modified build.xml to generate foo.jsp.html instead of foo.jsp.txt
using new Txt2Html task
  * Updated example HTML files to refer to foo.jsp.html instead of
foo.jsp.txt
  * Fixed some broken links and broken image links in some HTML files
  * Fixed plugin example to use relative path name to applet codebase
instead of absolute path
ADDED Files (attached):
  * jsr152/src/ant/task/Txt2Html.java
MODIFIED Files (see attached patch)
  * jsr152/build.xml
  * jsr152/examples/cal/calendar.html
  * jsr152/examples/checkbox/cresult.html
  * jsr152/examples/colors/clr.html
  * jsr152/examples/dates/date.html
  * jsr152/examples/error/er.html
  * jsr152/examples/forward/fwd.html
  * jsr152/examples/include/inc.html
  * jsr152/examples/jsp2/el/basic-arithmetic.html
  * jsr152/examples/jsp2/el/basic-comparisons.html
  * jsr152/examples/jsp2/el/functions.html
  * jsr152/examples/jsp2/el/implicit-objects.html
  * jsr152/examples/jsp2/jspattribute/jspattribute.html
  * jsr152/examples/jsp2/jspattribute/shuffle.html
  * jsr152/examples/jsp2/jspx/basic.html
  * jsr152/examples/jsp2/jspx/textRotate.html
  * jsr152/examples/jsp2/misc/config.html
  * jsr152/examples/jsp2/misc/dynamicattrs.html
  * jsr152/examples/jsp2/simpletag/book.html
  * jsr152/examples/jsp2/simpletag/hello.html
  * jsr152/examples/jsp2/simpletag/repeat.html
  * jsr152/examples/jsp2/tagfiles/hello.html
  * jsr152/examples/jsp2/tagfiles/panel.html
  * jsr152/examples/jsp2/tagfiles/products.html
  * jsr152/examples/jsptoserv/jts.html
  * jsr152/examples/num/numguess.html
  * jsr152/examples/plugin/plugin.html
  * jsr152/examples/plugin/plugin.jsp
  * jsr152/examples/sessions/crt.html
  * jsr152/examples/simpletag/foo.html
  * jsr152/examples/snp/snoop.html
  * jsr152/examples/xml/xml.html
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/build.xml
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/build.xml,v
retrieving revision 1.7
diff -u -r1.7 build.xml
--- jsr152/build.xml1 May 2003 22:39:50 -   1.7
+++ jsr152/build.xml3 Oct 2003 14:18:47 -
@@ -33,6 +33,7 @@
 mkdir dir=${jsp-api.build}/docs/
 mkdir dir=${jsp-api.build}/docs/api/
 mkdir dir=${jsp-api.build}/examples/
+mkdir dir=${jsp-api.build}/ant/
 
 !-- Dist Hierarchy --
 mkdir dir=${jsp-api.dist}/
@@ -106,8 +107,17 @@
   /target
 
 
-  !--  Build JavaDoc === --
-  target name=examples depends=prepare
+  !--  Build Examples === --
+  target name=ant depends=prepare
+javac  srcdir=src/ant destdir=${jsp-api.build}/ant
+debug=${compile.debug} deprecation=${compile.deprecation}
+optimize=${compile.optimize} 
+classpath=${ant.home}/lib/ant.jar /
+taskdefname=txt2html classname=task.Txt2Html
+classpath=${jsp-api.build}/ant /
+  /target
+  
+  target name=examples depends=prepare,ant
 
 copy todir=${jsp-api.build}/examples
   fileset dir=examples
@@ -115,7 +125,7 @@
   /fileset
 /copy
 
-copy todir=${jsp-api.build}/examples/jsp2/simpletag
+txt2html todir=${jsp-api.build}/examples/jsp2/simpletag
   fileset dir=examples/WEB-INF/classes/jsp2/examples
 include name=BookBean.java/
   /fileset
@@ -127,10 +137,9 @@
   fileset dir=examples/WEB-INF/classes/jsp2/examples/el
 include name=Functions.java/
   /fileset
-  mapper type=glob from=*.java to=*.java.txt/
-/copy
+/txt2html
 
-copy todir=${jsp-api.build}/examples/jsp2/jspattribute
+txt2html todir=${jsp-api.build}/examples/jsp2/jspattribute
   fileset dir=examples/WEB-INF/classes/jsp2/examples
 include name=FooBean.java/
   /fileset
@@ -139,47 +148,46 @@
 include name=TileSimpleTag.java/
 include name=HelloWorldSimpleTag.java/
   /fileset
-  mapper type=glob from=*.java to=*.java.txt/
-/copy
+/txt2html
 
-copy todir=${jsp-api.build}/examples/cal
+txt2html todir=${jsp-api.build}/examples/cal
   fileset dir=examples/WEB-INF/classes/cal
 include name=Entries.java/
 include name=Entry.java/
 include name=JspCalendar.java/
 include name=TableBean.java/
   /fileset
-  mapper type=glob from=*.java to=*.java.txt/
-/copy
+/txt2html
 
-copy todir=${jsp-api.build}/examples/jsptoserv
+txt2html todir=${jsp-api.build}/examples/jsptoserv
   fileset 

[PATCH] jakarta-servletapi-5: fix description

[Yuta Yoshida]

Hi,

The attached file is to update the servlet2.4 API.

jsr154/src/share/javax/servlet/ServletRequest.java
Fix the confusing description in getServerName()
and getServerPort() - change host header to
host header value.
thank you,
yutaka yoshida
Sun Microsystems, Inc.
Index: jsr154/src/share/javax/servlet/ServletRequest.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequest.java,v
retrieving revision 1.8
diff -u -r1.8 ServletRequest.java
--- jsr154/src/share/javax/servlet/ServletRequest.java  30 Sep 2003 19:49:00 - 
 1.8
+++ jsr154/src/share/javax/servlet/ServletRequest.java  1 Oct 2003 00:52:29 -
@@ -351,7 +351,7 @@
 /**
  * Returns the host name of the server to which the request was sent.
  * It is the value of the part before : in the codeHost/code
- * header, if any, or the resolved server name, or the server IP address.
+ * header value, if any, or the resolved server name, or the server IP address.
  *
  * @return a codeString/code containing the name 
  * of the server
@@ -365,7 +365,7 @@
 /**
  * Returns the port number to which the request was sent.
  * It is the value of the part after : in the codeHost/code
- * header, if any, or the server port where the client connection
+ * header value, if any, or the server port where the client connection
  * was accepted on.
  *
  * @return an integer specifying the port number

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: Update to j2ee_1_4.xsd

[Mark Roth]

Attached is a patch to update the J2EE 1.4 schema.

jsr154/src/share/dtd/j2ee_1_4.xsd
- clarify that fully-qualified-classType is a binary name
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr154/src/share/dtd/j2ee_1_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.9
diff -u -r1.9 j2ee_1_4.xsd
--- jsr154/src/share/dtd/j2ee_1_4.xsd   18 Aug 2003 17:41:20 -  1.9
+++ jsr154/src/share/dtd/j2ee_1_4.xsd   25 Sep 2003 21:42:48 -
@@ -8,7 +8,7 @@
  version=1.4
   xsd:annotation
 xsd:documentation
-  @(#)j2ee_1_4.xsds1.42 03/08/01
+  @(#)j2ee_1_4.xsds1.43 03/09/16
 /xsd:documentation
   /xsd:annotation
 
@@ -497,7 +497,11 @@
   xsd:documentation
 
The elements that use this type designate the name of a
-   Java class or interface.
+   Java class or interface.  The name is in the form of a
+   binary name, as defined in the JLS.  This is the form
+   of name used in Class.forName().  Tools that need the
+   canonical name (the name used in source code) will need
+   to convert this binary name to the canonical name.
 
   /xsd:documentation
 /xsd:annotation

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: API update

[Yuta Yoshida]

Hi,

The attached file is to update the Servlet 2.4 API.
Changes are synchronizing with the latest specification
and fixing a typo and a bad indentation. All semantics
stay the same.

o Fix typo and indentation:
jsr154/src/share/javax/servlet/Filter.java
jsr154/src/share/javax/servlet/FilterChain.java
jsr154/src/share/javax/servlet/GenericServlet.java
jsr154/src/share/javax/servlet/ServletContext.java
jsr154/src/share/javax/servlet/ServletContextAttributeEvent.java
jsr154/src/share/javax/servlet/ServletContextAttributeListener.java
jsr154/src/share/javax/servlet/ServletContextEvent.java
jsr154/src/share/javax/servlet/ServletOutputStream.java
jsr154/src/share/javax/servlet/ServletRequest.java
jsr154/src/share/javax/servlet/ServletResponse.java
jsr154/src/share/javax/servlet/http/HttpServletRequest.java
jsr154/src/share/javax/servlet/http/HttpServletResponse.java
jsr154/src/share/javax/servlet/http/HttpSession.java
jsr154/src/share/javax/servlet/http/HttpSessionBindingEvent.java
o Synchronize with the spec:
jsr154/src/share/javax/servlet/ServletContextListener.java
jsr154/src/share/javax/servlet/ServletRequestAttributeEvent.java
jsr154/src/share/javax/servlet/ServletRequestAttributeListener.java
jsr154/src/share/javax/servlet/ServletRequestEvent.java
jsr154/src/share/javax/servlet/ServletRequestListener.java
==
Thank you,
Yutaka Yoshida
Sun Microsystems


Index: jsr154/src/share/javax/servlet/Filter.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/Filter.java,v
retrieving revision 1.2
diff -u -r1.2 Filter.java
--- jsr154/src/share/javax/servlet/Filter.java  18 Aug 2003 16:50:33 -  1.2
+++ jsr154/src/share/javax/servlet/Filter.java  18 Sep 2003 23:34:58 -
@@ -114,7 +114,7 @@
* filter content or headers for output filtering br
* 4. a) strongEither/strong invoke the next entity in the chain using the 
FilterChain object (codechain.doFilter()/code), br   
** 4. b) strongor/strong not pass on the request/response pair to the next 
entity in the filter chain to block the request processingbr
-   ** 5. Directly set headers on the response after invocation of the next entity 
in ther filter chain.
+   ** 5. Directly set headers on the response after invocation of the next entity 
in the filter chain.
**/
 public void doFilter ( ServletRequest request, ServletResponse response, 
FilterChain chain ) throws IOException, ServletException;
 
Index: jsr154/src/share/javax/servlet/FilterChain.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/FilterChain.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 FilterChain.java
--- jsr154/src/share/javax/servlet/FilterChain.java 13 Aug 2002 16:21:42 - 
 1.1.1.1
+++ jsr154/src/share/javax/servlet/FilterChain.java 18 Sep 2003 23:34:58 -
@@ -66,7 +66,7 @@
 * A FilterChain is an object provided by the servlet container to the developer
 * giving a view into the invocation chain of a filtered request for a resource. 
Filters
 * use the FilterChain to invoke the next filter in the chain, or if the calling 
filter
-* is the last filter in the chain, to invoke the rosource at the end of the chain.
+* is the last filter in the chain, to invoke the resource at the end of the chain.
 *
 * @see Filter
 * @since Servlet 2.3
Index: jsr154/src/share/javax/servlet/GenericServlet.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/GenericServlet.java,v
retrieving revision 1.2
diff -u -r1.2 GenericServlet.java
--- jsr154/src/share/javax/servlet/GenericServlet.java  11 Jan 2003 00:26:02 - 
 1.2
+++ jsr154/src/share/javax/servlet/GenericServlet.java  18 Sep 2003 23:34:58 -
@@ -136,7 +136,7 @@
  * of the initialization parameter
  *
  * @return String  a codeString/code containing the value
- * of the initalization parameter
+ * of the initialization parameter
  *
  */ 
 
Index: jsr154/src/share/javax/servlet/ServletContext.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletContext.java,v
retrieving revision 1.5
diff -u -r1.5 ServletContext.java
--- jsr154/src/share/javax/servlet/ServletContext.java  2 Sep 2003 21:14:10 -  
 1.5
+++ jsr154/src/share/javax/servlet/ServletContext.java  18 Sep 2003 23:34:58 -
@@ -674,7 +674,7 @@
 public void removeAttribute(String name);
 
 /**
- * Returns the name of this web application correponding 

[PATCH] jakarta-servletapi-5 Clarification to IterationTag

[Mark Roth]

jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Clarified that doAfterBody() is not called if there is no body.
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v
retrieving revision 1.6
diff -u -r1.6 IterationTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 31 Mar 2003 17:52:26 
-  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 3 Sep 2003 19:53:38 
-
@@ -91,21 +91,23 @@
  *
  * pBEmpty and Non-Empty Action/B
  * p If the TagLibraryDescriptor file indicates that the action must
- * always have an empty action, by an lt;body-contentgt; entry of empty,
- * then the doStartTag() method must return SKIP_BODY.
+ * always have an empty element body, by a lt;body-contentgt; entry of 
+ * empty, then the doStartTag() method must return SKIP_BODY.
  *
- * Otherwise, the doStartTag() method may return SKIP_BODY or
- * EVAL_BODY_INCLUDE.
+ * pNote that which methods are invoked after the doStartTag() depends on
+ * both the return value and on if the custom action element is empty
+ * or not in the JSP page, not on how it's declared in the TLD.
  *
  * p
  * If SKIP_BODY is returned the body is not evaluated, and then doEndTag()
  * is invoked.
  *
  * p
- * If EVAL_BODY_INCLUDE is returned, the body is evaluated and
- * passed through to the current out, then doAfterBody() is invoked
- * and, after zero or more iterations, doEndTag() is invoked.
-*/
+ * If EVAL_BODY_INCLUDE is returned, and the custom action element is not
+ * empty, the body is evaluated and passed through to the current out, 
+ * then doAfterBody() is invoked and, after zero or more iterations, 
+ * doEndTag() is invoked.
+ */
 
 public interface IterationTag extends Tag {
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: schema updates

[yuta]

Hi,

The attached file is to fix the bug in the Servlet 2.4
deployment descriptor schema file.
jsr154/share/dtd/web-app_2_4.xsd
The name in xsd:key,xsd:keyref, and xsd:unique
must be unique within the j2ee namespace.
Thank you,
Yutaka Yoshida
Sun Microsystems
Index: jsr154/src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.11
diff -u -r1.11 web-app_2_4.xsd
--- jsr154/src/share/dtd/web-app_2_4.xsd16 May 2003 23:20:18 -  1.11
+++ jsr154/src/share/dtd/web-app_2_4.xsd26 Aug 2003 20:53:03 -
@@ -126,7 +126,7 @@
   /xsd:documentation
 /xsd:annotation
 
-xsd:unique name=servlet-name-uniqueness
+xsd:unique name=web-app-servlet-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -139,7 +139,7 @@
   xsd:fieldxpath=j2ee:servlet-name/
 /xsd:unique
 
-xsd:unique name=filter-name-uniqueness
+xsd:unique name=web-app-filter-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -152,7 +152,7 @@
   xsd:fieldxpath=j2ee:filter-name/
 /xsd:unique
 
-xsd:unique name=ejb-local-ref-name-uniqueness
+xsd:unique name=web-app-ejb-local-ref-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -170,7 +170,7 @@
   xsd:fieldxpath=j2ee:ejb-ref-name/
 /xsd:unique
 
-xsd:unique name=ejb-ref-name-uniqueness
+xsd:unique name=web-app-ejb-ref-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -188,7 +188,7 @@
   xsd:fieldxpath=j2ee:ejb-ref-name/
 /xsd:unique
 
-xsd:unique name=resource-env-ref-uniqueness
+xsd:unique name=web-app-resource-env-ref-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -204,7 +204,7 @@
   xsd:fieldxpath=j2ee:resource-env-ref-name/
 /xsd:unique
 
-xsd:unique name=message-destination-ref-uniqueness
+xsd:unique name=web-app-message-destination-ref-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -220,7 +220,7 @@
   xsd:fieldxpath=j2ee:message-destination-ref-name/
 /xsd:unique
 
-xsd:unique name=res-ref-name-uniqueness
+xsd:unique name=web-app-res-ref-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -235,7 +235,7 @@
   xsd:fieldxpath=j2ee:res-ref-name/
 /xsd:unique
 
-xsd:unique name=env-entry-name-uniqueness
+xsd:unique name=web-app-env-entry-name-uniqueness
   xsd:annotation
xsd:documentation
 
@@ -251,7 +251,7 @@
   xsd:fieldxpath=j2ee:env-entry-name/
 /xsd:unique
 
-xsd:key name=role-name-key
+xsd:key name=web-app-role-name-key
   xsd:annotation
xsd:documentation
 
@@ -264,8 +264,8 @@
   xsd:fieldxpath=j2ee:role-name/
 /xsd:key
 
-xsd:keyref name=role-name-references
-   refer=j2ee:role-name-key
+xsd:keyref name=web-app-role-name-references
+   refer=j2ee:web-app-role-name-key
   xsd:annotation
xsd:documentation
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5 API Changes

[Mark Roth]

jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- Fixed incorrect clarification of getVariableInfo().  The original
  semantics requiring special treatment of the id attribute
  were supposed to have been removed in JSP 1.2.  We brought them
  back to life in JSP 2.0, but the right thing to do was to remove
  them altogether, as no containers implemented them anyway.
jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- Clarified that the URI passed to validate() is the same as
  the URI in the XML View, not the uri passed to the taglib
  directive (which doesn't always exist or produce consistent
  results)
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.7
diff -u -r1.7 TagInfo.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  8 Aug 2003 22:27:40 
-   1.7
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  25 Aug 2003 20:15:19 
-
@@ -268,25 +268,13 @@
  * @param data TagData describing this action.
  * @return if a TagExtraInfo object is associated with this TagInfo, the
  * result of getTagExtraInfo().getVariableInfo( data ), otherwise
- * null if the tag has no id attribute or new VariableInfo[] {
- * new VariableInfo( data.getId(), java.lang.Object, true,
- * VariableInfo.NESTED ) } if an id attribute is present.
+ * null.
  */
public VariableInfo[] getVariableInfo(TagData data) {
VariableInfo[] result = null;
TagExtraInfo tei = getTagExtraInfo();
if (tei != null) {
   result = tei.getVariableInfo( data );
-   }
-   else {
-  String idValue = data.getId();
-  if( idValue != null ) {
-  result = 
-  new VariableInfo[] {
-  new VariableInfo( idValue, java.lang.Object,
-  true, VariableInfo.NESTED )
-  };
-  }
}
return result;
}
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java,v
retrieving revision 1.6
diff -u -r1.6 TagLibraryValidator.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java  14 Apr 2003 
17:36:39 -  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java  25 Aug 2003 
20:15:19 -
@@ -76,7 +76,7 @@
  *
  * once initialized, the validate(String, String, PageData) method will
  * be invoked, where the first two arguments are the prefix
- * and uri arguments used in the taglib directive.  The prefix is intended
+ * and uri for this tag library in the XML View.  The prefix is intended
  * to make it easier to produce an error message.  However, it is not
  * always accurate.  In the case where a single URI is mapped to more 
  * than one prefix in the XML view, the prefix of the first URI is provided.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: Schema updates

[Mark Roth]

The following is a patch to the JSP 2.0 TLD and J2EE 1.4 schemas based 
on recent specification changes.

jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Made body-content element mandatory since default valid
  is unusable for Simple Tag Handlers.
jsr154/src/share/dtd/j2ee_1_4.xsd
- Updated to latest J2EE 1.4 schema
- Moved java-typeType to common file.
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.12
diff -u -r1.12 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  16 May 2003 23:20:17 - 
 1.12
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 14:25:09 -
@@ -472,12 +472,15 @@
/xsd:annotation
   /xsd:element
   xsd:element name=body-content
-  type=j2ee:body-contentType
-  minOccurs=0
+  type=j2ee:body-contentType
xsd:annotation
  xsd:documentation
 
-   The default (if not defined) is JSP
+   Specifies the format for the body of this tag.
+   The default in JSP 1.2 was JSP but because this is an invalid
+   setting for simple tag handlers, there is no longer a default
+   in JSP 2.0.  A reasonable default for simple tag handlers is
+   scriptless if the tag can have a body.
 
  /xsd:documentation
/xsd:annotation
Index: jsr154/src/share/dtd/j2ee_1_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.8
diff -u -r1.8 j2ee_1_4.xsd
--- jsr154/src/share/dtd/j2ee_1_4.xsd   16 May 2003 23:20:18 -  1.8
+++ jsr154/src/share/dtd/j2ee_1_4.xsd   18 Aug 2003 14:25:09 -
@@ -8,7 +8,7 @@
  version=1.4
   xsd:annotation
 xsd:documentation
-  %W% %E%
+  @(#)j2ee_1_4.xsds1.42 03/08/01
 /xsd:documentation
   /xsd:annotation
 
@@ -637,6 +637,25 @@
 xsd:simpleContent
   xsd:restriction base=j2ee:string
xsd:pattern value=($|_|\p{L})(\p{L}|\p{Nd}|_|$)*/
+  /xsd:restriction
+/xsd:simpleContent
+  /xsd:complexType
+
+!--  --
+
+  xsd:complexType name=java-typeType
+xsd:annotation
+  xsd:documentation
+
+   This is a generic type that designates a Java primitive
+   type or a fully qualified name of a Java interface/type,
+   or an array of such types.
+
+  /xsd:documentation
+/xsd:annotation
+xsd:simpleContent
+  xsd:restriction base=j2ee:string
+   xsd:pattern value=[^\p{Z}]*/
   /xsd:restriction
 /xsd:simpleContent
   /xsd:complexType
Index: jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.12
diff -u -r1.12 web-jsptaglibrary_2_0.xsd
--- jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  16 May 2003 23:20:18 - 
 1.12
+++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 14:25:09 -
@@ -472,12 +472,15 @@
/xsd:annotation
   /xsd:element
   xsd:element name=body-content
-  type=j2ee:body-contentType
-  minOccurs=0
+  type=j2ee:body-contentType
xsd:annotation
  xsd:documentation
 
-   The default (if not defined) is JSP
+   Specifies the format for the body of this tag.
+   The default in JSP 1.2 was JSP but because this is an invalid
+   setting for simple tag handlers, there is no longer a default
+   in JSP 2.0.  A reasonable default for simple tag handlers is
+   scriptless if the tag can have a body.
 
  /xsd:documentation
/xsd:annotation

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: Additional TLD clarifications

[Mark Roth]

Slight additional clarification to TLD.

jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Clarified that body-content is not just a hint
- Reformatted description for body-content with smaller margins
  for spec
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.13
diff -u -r1.13 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 17:41:20 - 
 1.13
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 18:47:14 -
@@ -131,8 +131,11 @@
 xsd:annotation
   xsd:documentation
 
-   Provides a hint as to the content of the body of this tag.
-   Primarily intended for use by page composition tools.
+Specifies the type of body that is valid for a tag.
+   This value is used by the JSP container to validate
+   that a tag invocation has the correct body syntax and
+   by page composition tools to assist the page author
+   in providing a valid tag body.
 
There are currently four values specified:
 
@@ -477,10 +480,11 @@
  xsd:documentation
 
Specifies the format for the body of this tag.
-   The default in JSP 1.2 was JSP but because this is an invalid
-   setting for simple tag handlers, there is no longer a default
-   in JSP 2.0.  A reasonable default for simple tag handlers is
-   scriptless if the tag can have a body.
+   The default in JSP 1.2 was JSP but because this
+   is an invalid setting for simple tag handlers, there
+   is no longer a default in JSP 2.0.  A reasonable
+   default for simple tag handlers is scriptless if
+   the tag can have a body.
 
  /xsd:documentation
/xsd:annotation
Index: jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.13
diff -u -r1.13 web-jsptaglibrary_2_0.xsd
--- jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 17:41:20 - 
 1.13
+++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd  18 Aug 2003 18:47:14 -
@@ -131,8 +131,11 @@
 xsd:annotation
   xsd:documentation
 
-   Provides a hint as to the content of the body of this tag.
-   Primarily intended for use by page composition tools.
+Specifies the type of body that is valid for a tag.
+   This value is used by the JSP container to validate
+   that a tag invocation has the correct body syntax and
+   by page composition tools to assist the page author
+   in providing a valid tag body.
 
There are currently four values specified:
 
@@ -477,10 +480,11 @@
  xsd:documentation
 
Specifies the format for the body of this tag.
-   The default in JSP 1.2 was JSP but because this is an invalid
-   setting for simple tag handlers, there is no longer a default
-   in JSP 2.0.  A reasonable default for simple tag handlers is
-   scriptless if the tag can have a body.
+   The default in JSP 1.2 was JSP but because this
+   is an invalid setting for simple tag handlers, there
+   is no longer a default in JSP 2.0.  A reasonable
+   default for simple tag handlers is scriptless if
+   the tag can have a body.
 
  /xsd:documentation
/xsd:annotation

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: API updates

[Mark Roth]

The following patch includes an API update from the JSP 2.0 specification.

jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java:
- Clarified javadocs for setJspContext()
jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java:
- Clarified javadocs for setJspContext()
jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java:
- Corrected error in constructor javadoc for JSP 1.1 TLD
jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java:
- Changed to an abstract class
- Added getJspContext() method
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java,v
retrieving revision 1.5
diff -u -r1.5 JspFragment.java
--- jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java  18 Dec 2002 18:35:37 
-  1.5
+++ jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java  8 Aug 2003 19:37:38 
-
@@ -66,7 +66,7 @@
  * The definition of the JSP fragment must only contain template 
  * text and JSP action elements.  In other words, it must not contain
  * scriptlets or scriptlet expressions.  At translation time, the 
- * container generates an implementation of the JspFragment interface
+ * container generates an implementation of the JspFragment abstract class
  * capable of executing the defined fragment.
  * p
  * A tag handler can invoke the fragment zero or more times, or 
@@ -85,7 +85,7 @@
  *
  * @since 2.0
  */
-public interface JspFragment {
+public abstract class JspFragment {
 
 /**
  * Executes the fragment and directs all output to the given Writer,
@@ -104,7 +104,14 @@
  * @throws java.io.IOException If there was an error writing to the 
  * stream.
  */
-public void invoke( java.io.Writer out )
+public abstract void invoke( java.io.Writer out )
 throws javax.servlet.jsp.JspException, java.io.IOException;
+
+/**
+ * Returns the JspContext that is bound to this JspFragment.
+ *
+ * @return The JspContext used by this fragment at invocation time.
+ */
+public JspContext getJspContext();
 
 }
Index: jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java,v
retrieving revision 1.7
diff -u -r1.7 SimpleTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java12 May 2003 16:52:10 
-  1.7
+++ jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java8 Aug 2003 19:37:38 
-
@@ -153,8 +153,9 @@
 public JspTag getParent();
 
 /**
- * Stores the provided JSP context in the protected 
- * jspContext field.
+ * Called by the container to provide this tag handler with
+ * the codeJspContext/code for this invocation.
+ * An implementation should save this value.
  * 
  * @param pc the page context for this invocation
  * @see Tag#setPageContext
Index: jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java,v
retrieving revision 1.8
diff -u -r1.8 SimpleTagSupport.java
--- jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java 16 May 2003 
02:39:00 -  1.8
+++ jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java 8 Aug 2003 
19:37:38 -
@@ -131,8 +131,9 @@
 }
 
 /**
- * Stores the provided JSP context in the protected 
- * jspContext field.
+ * Stores the provided JSP context in the private jspContext field.
+ * Subclasses can access the codeJspContext/code via 
+ * codegetJspContext()/code.
  * 
  * @param pc the page context for this invocation
  * @see SimpleTag#setJspContext
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.6
diff -u -r1.6 TagInfo.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  31 Mar 2003 17:52:26 
-  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  8 Aug 2003 19:37:38 
-
@@ -92,7 +92,7 @@
 public static final String BODY_CONTENT_SCRIPTLESS = SCRIPTLESS;
 
 /**
- * Constructor for TagInfo from data in the JSP 2.0 format for TLD.
+ * Constructor for TagInfo from data in the JSP 1.1 format for TLD.
  * This class is to be instantiated only from the TagLibrary code
  * under request from some JSP code that is parsing a
  * TLD (Tag Library 

[PATCH] jakarta-servletapi-5: API updates

[Yutaka Yoshida]

Hi,
(B
(BThe attached file is to update the Servlet 2.4 API.
(BChanges are:
(B
(B* Fix typos
(B
(B  jsr154/src/share/javax/servlet/Filter.java
(B  jsr154/src/share/javax/servlet/FilterConfig.java
(B  jsr154/src/share/javax/servlet/ServletConfig.java
(B  jsr154/src/share/javax/servlet/ServletContextAttributeEvent.java
(B  jsr154/src/share/javax/servlet/ServletContextListener.java
(B  jsr154/src/share/javax/servlet/ServletOutputStream.java
(B  jsr154/src/share/javax/servlet/UnavailableException.java
(B  jsr154/src/share/javax/servlet/http/Cookie.java
(B  jsr154/src/share/javax/servlet/http/HttpServlet.java
(B  jsr154/src/share/javax/servlet/http/HttpServletRequest.java
(B  jsr154/src/share/javax/servlet/http/HttpServletResponse.java
(B  jsr154/src/share/javax/servlet/http/HttpSession.java
(B  jsr154/src/share/javax/servlet/http/HttpSessionListener.java
(B
(B* Add the condition to return null in "Returns" in getRequestDispatcher
(B
(B  jsr154/src/share/javax/servlet/ServletContext.java
(B  jsr154/src/share/javax/servlet/ServletRequest.java
(B
(B* Clarification of internationalization: making clear the
(B  relationship among setLocale(), setContentType, and
(B  setCharacterEncoding
(B
(B  jsr154/src/share/javax/servlet/ServletResponse.java
(B
(B--
(BYutaka Yoshida
(BJava/XML Software Group
(BSun Microsystems Inc.Index: jsr154/src/share/javax/servlet/Filter.java
(B===
(BRCS file: 
(B/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/Filter.java,v
(Bretrieving revision 1.1.1.1
(Bdiff -u -r1.1.1.1 Filter.java
(B--- jsr154/src/share/javax/servlet/Filter.java  13 Aug 2002 16:21:42 -  1.1.1.1
(B+++ jsr154/src/share/javax/servlet/Filter.java  30 Jul 2003 18:01:54 -
(B@@ -63,7 +63,7 @@
(B import java.io.IOException;
(B 
(B/** 
(B-   * A filter is an object than perform filtering tasks on either the request to 
(Ba resource (a servlet or static content), or on the response from a resource, or both.
(B+   * A filter is an object that performs filtering tasks on either the request to 
(Ba resource (a servlet or static content), or on the response from a resource, or both.
(B * brbr
(B* Filters perform filtering in the codedoFilter/code method. Every Filter 
(Bhas access to 
(B** a FilterConfig object from which it can obtain its initialization 
(Bparameters, a
(B@@ -114,7 +114,7 @@
(B* filter content or headers for output filtering br
(B* 4. a) strongEither/strong invoke the next entity in the chain using the 
(BFilterChain object (codechain.doFilter()/code), br   
(B** 4. b) strongor/strong not pass on the request/response pair to the next 
(Bentity in the filter chain to block the request processingbr
(B-   ** 5. Directly set headers on the response after invokation of the next entity 
(Bin ther filter chain.
(B+   ** 5. Directly set headers on the response after invocation of the next entity 
(Bin ther filter chain.
(B**/
(B public void doFilter ( ServletRequest request, ServletResponse response, 
(BFilterChain chain ) throws IOException, ServletException;
(B 
(BIndex: jsr154/src/share/javax/servlet/FilterConfig.java
(B===
(BRCS file: 
(B/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/FilterConfig.java,v
(Bretrieving revision 1.1.1.1
(Bdiff -u -r1.1.1.1 FilterConfig.java
(B--- jsr154/src/share/javax/servlet/FilterConfig.java13 Aug 2002 16:21:42 - 
(B 1.1.1.1
(B+++ jsr154/src/share/javax/servlet/FilterConfig.java30 Jul 2003 18:01:54 -
(B@@ -68,7 +68,7 @@
(B /** 
(B *
(B * A filter configuration object used by a servlet container
(B-* used to pass information to a filter during initialization.
(B+* to pass information to a filter during initialization.
(B * @see Filter 
(B  * @since  Servlet 2.3
(B *
(B@@ -116,13 +116,13 @@
(B 
(B 
(B /**
(B- * Returns the names of the servlet's initialization parameters
(B+ * Returns the names of the filter's initialization parameters
(B  * as an codeEnumeration/code of codeString/code objects, 
(B- * or an empty codeEnumeration/code if the servlet has
(B+ * or an empty codeEnumeration/code if the filter has
(B  * no initialization parameters.
(B  *
(B  * @return an codeEnumeration/code of codeString/code 
(B- * objects containing the names of the servlet's 
(B+ * objects containing the names of the filter's 
(B  * initialization parameters
(B  *
(B  *
(BIndex: jsr154/src/share/javax/servlet/ServletConfig.java
(B===
(BRCS file: 

[PATCH] jakarta-servletapi-5: JSP 2.0 API updates

[Mark Roth]

Here are the latest round of JSP 2.0 API updates.  Some changes will 
need to be made to jakarta-commons-sandbox/el before applying this patch.

I also made a couple of changes to the JSP 2.0 examples in accordance 
with these changes.

jsr152/src/share/dtd/jsp_2_0.xsd:
jsr154/src/share/dtd/jsp_2_0.xsd:
- Expanded on description for taglibType complex type.
jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java:
- Change getJspBody() to be protected
- Change getJspContext() to be protected
- Change the jspBody field to be private
- Change the jspContext field to be private.
jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java:
- Changed so that Strings of the form abc${1+1}def${1+1}ghi cannot
  be parsed or evaluated.  Only one expression can be parsed
  evaluated at a time, and no static text can appear.
jsr152/src/share/javax/servlet/jsp/JspWriter.java:
- Changed javadocs for print() methods to indicate that the
  resulting text is written to the writer, and not converted to
  the platform's default character encoding first, which would
  make no sense.
jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- getTagName() - Clarified that name is always returned (cannot
  be null)
jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
- Accessibility fix.  Added img alt tag.
jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
- Accessibility fix.  Added img alt tag.
jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Accessibility fix.  Added img alt tag.
jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
- Accessibility fix.  Added img alt tag and table summary tag.
jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
- evaluate() - Removed defaultPrefix param and allow FunctionMapper
  to mutate after call.
- parseExpression() - Removed defaultPrefix param and allow
  FunctionMapper to mutate after call.
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java,v
retrieving revision 1.2
diff -u -r1.2 RepeatSimpleTag.java
--- jsr152/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java   
 28 Oct 2002 17:45:43 -  1.2
+++ jsr152/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java   
 24 Mar 2003 22:34:48 -
@@ -19,7 +19,7 @@
 
 public void doTag() throws JspException, IOException {
 for (int i=0; inum; i++) {
-jspContext.setAttribute(count, String.valueOf( i + 1 ) );
+getJspContext().setAttribute(count, String.valueOf( i + 1 ) );
getJspBody().invoke(null);
 }
 }
Index: jsr152/src/share/javax/servlet/jsp/JspWriter.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspWriter.java,v
retrieving revision 1.3
diff -u -r1.3 JspWriter.java
--- jsr152/src/share/javax/servlet/jsp/JspWriter.java   29 Oct 2002 01:18:11 - 
 1.3
+++ jsr152/src/share/javax/servlet/jsp/JspWriter.java   24 Mar 2003 22:35:14 -
@@ -165,10 +165,9 @@
 
 /**
  * Print a boolean value.  The string produced by code[EMAIL PROTECTED]
- * java.lang.String#valueOf(boolean)}/code is translated into bytes
- * according to the platform's default character encoding, and these bytes
- * are written in exactly the manner of the code[EMAIL PROTECTED]
- * #write(int)}/code method.
+ * java.lang.String#valueOf(boolean)}/code is written to the
+ * JspWriter's buffer or, if no buffer is used, directly to the 
+ * underlying writer.
  *
  * @param  b   The codeboolean/code to be printed
  * @throwsjava.io.IOException If an error occured while writing
@@ -177,10 +176,9 @@
 abstract public void print(boolean b) throws IOException;
 
 /**
- * Print a character.  The character is translated into one or more bytes
- * according to the platform's default character encoding, and these bytes
- * are written in exactly the manner of the code[EMAIL PROTECTED]
- * #write(int)}/code method.
+ * Print a character.  The character is written to the
+ * JspWriter's buffer or, if no buffer is used, directly to the
+ * underlying writer.
  *
  * @param  c   The codechar/code to be printed
  * @throwsjava.io.IOException If an error occured while writing
@@ -190,10 +188,9 @@
 
 /**
  * Print an integer.  The string produced by code[EMAIL PROTECTED]
- * java.lang.String#valueOf(int)}/code is translated into bytes according
- * to the platform's default character encoding, and these bytes are
- * 

[PATCH] jakarta-servletapi-5: minor updates

[Yutaka Yoshida]

Hi,

The attached patch is to update the Servlet 2.4 API as follows:

1) Add @since 2.4 into the added methods in:
jsr154/src/share/javax/servlet/ServletRequest.java
jsr154/src/share/javax/servlet/ServletRequestWrapper.java
jsr154/src/share/javax/servlet/ServletResponse.java
jsr154/src/share/javax/servlet/ServletResponseWrapper.java
jsr154/src/share/javax/servlet/http/HttpSession.java

2) Add summary in the table
jsr154/src/share/javax/servlet/http/HttpServletRequest.java

--
Yutaka Yoshida
Java/XML Software Group
Sun Microsystems Inc.


Index: jsr154/src/share/javax/servlet/ServletRequest.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequest.java,v
retrieving revision 1.3
diff -u -r1.3 ServletRequest.java
--- jsr154/src/share/javax/servlet/ServletRequest.java  5 Mar 2003 19:42:48 -  
 1.3
+++ jsr154/src/share/javax/servlet/ServletRequest.java  20 Mar 2003 21:50:06 -
@@ -592,6 +592,8 @@
 /**
  * Returns the Internet Protocol (IP) source port of the client
  * or last proxy that sent the request.
+ *
+ * @since 2.4
  */
 public int getRemotePort();
 
@@ -602,6 +604,8 @@
  *
  * @return a codeString/code containing the host
  * name of the IP on which the request was received.
+ *
+ * @since 2.4
  */
 public String getLocalName();
 
@@ -612,6 +616,8 @@
  * @return a codeString/code containing the
  * IP address on which the request was received. 
  *
+ * @since 2.4
+ *
  */   
 public String getLocalAddr();
 
@@ -621,6 +627,8 @@
  * on which the request was received.
  *
  * @return an integer specifying the port number
+ *
+ * @since 2.4
  */
 public int getLocalPort();
 
Index: jsr154/src/share/javax/servlet/ServletRequestWrapper.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequestWrapper.java,v
retrieving revision 1.3
diff -u -r1.3 ServletRequestWrapper.java
--- jsr154/src/share/javax/servlet/ServletRequestWrapper.java   5 Mar 2003 19:42:48 
-   1.3
+++ jsr154/src/share/javax/servlet/ServletRequestWrapper.java   20 Mar 2003 21:50:06 
-
@@ -403,6 +403,8 @@
 /**
  * The default behavior of this method is to return
  * getRemotePort() on the wrapped request object.
+ *
+ * @since 2.4
  */
 public int getRemotePort(){
 return this.request.getRemotePort();
@@ -412,6 +414,8 @@
 /**
  * The default behavior of this method is to return
  * getLocalName() on the wrapped request object.
+ *
+ * @since 2.4
  */
 public String getLocalName(){
 return this.request.getLocalName();
@@ -420,6 +424,8 @@
 /**
  * The default behavior of this method is to return
  * getLocalAddr() on the wrapped request object.
+ *
+ * @since 2.4
  */   
 public String getLocalAddr(){
 return this.request.getLocalAddr();
@@ -429,6 +435,8 @@
 /**
  * The default behavior of this method is to return
  * getLocalPort() on the wrapped request object.
+ *
+ * @since 2.4
  */
 public int getLocalPort(){
 return this.request.getLocalPort();
Index: jsr154/src/share/javax/servlet/ServletResponse.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletResponse.java,v
retrieving revision 1.2
diff -u -r1.2 ServletResponse.java
--- jsr154/src/share/javax/servlet/ServletResponse.java 5 Mar 2003 19:42:48 -  
 1.2
+++ jsr154/src/share/javax/servlet/ServletResponse.java 20 Mar 2003 21:50:06 -
@@ -149,6 +149,8 @@
  * content type, for example,
  * codetext/html; charset=UTF-8/code,
  * or null
+ *
+ * @since 2.4
  */
   
 public String getContentType();
@@ -243,6 +245,8 @@
  *
  * @see#setContentType
  * #setLocale
+ *
+ * @since 2.4
  *
  */
 
Index: jsr154/src/share/javax/servlet/ServletResponseWrapper.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletResponseWrapper.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ServletResponseWrapper.java
--- jsr154/src/share/javax/servlet/ServletResponseWrapper.java  13 Aug 2002 16:21:43 
-  1.1.1.1
+++ jsr154/src/share/javax/servlet/ServletResponseWrapper.java  20 Mar 2003 21:50:06 
-
@@ -120,6 +120,8 @@
 /**
  * The default behavior of this method is to call setCharacterEncoding(String 
charset)
  * on the wrapped response object.
+ *
+ * @since 2.4
  */
 

[PATCH] jakarta-servletapi-5 - EL examples

[Mark Roth]

Quick patch to improve JSP 2.0 EL examples:

* Added example of conditional operator ${(1==2) ? 3 : 4}
  Commented out, since this is not yet implemented.
* Changed quoting from old-style ${'${'} 1 + 2 }
  to new-style \${ 1 + 2 }
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/examples/jsp2/el/basic-arithmetic.jsp
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/examples/jsp2/el/basic-arithmetic.jsp,v
retrieving revision 1.1
diff -u -r1.1 basic-arithmetic.jsp
--- jsr152/examples/jsp2/el/basic-arithmetic.jsp7 Sep 2002 00:47:59 -  
 1.1
+++ jsr152/examples/jsp2/el/basic-arithmetic.jsp19 Mar 2003 03:39:43 -
@@ -18,49 +18,55 @@
tdbResult/b/td
  /thead
  tr
-   td${'${'}1}/td
+   td\${1}/td
td${1}/td
  /tr
  tr
-   td${'${'}1 + 2}/td
+   td\${1 + 2}/td
td${1 + 2}/td
  /tr
  tr
-   td${'${'}1.2 + 2.3}/td
+   td\${1.2 + 2.3}/td
td${1.2 + 2.3}/td
  /tr
  tr
-   td${'${'}1.2E4 + 1.4}/td
+   td\${1.2E4 + 1.4}/td
td${1.2E4 + 1.4}/td
  /tr
  tr
-   td${'${'}-4 - 2}/td
+   td\${-4 - 2}/td
td${-4 - 2}/td
  /tr
  tr
-   td${'${'}21 * 2}/td
+   td\${21 * 2}/td
td${21 * 2}/td
  /tr
  tr
-   td${'${'}3/4}/td
+   td\${3/4}/td
td${3/4}/td
  /tr
  tr
-   td${'${'}3 div 4}/td
+   td\${3 div 4}/td
td${3 div 4}/td
  /tr
  tr
-   td${'${'}3/0}/td
+   td\${3/0}/td
td${3/0}/td
  /tr
  tr
-   td${'${'}10%4}/td
+   td\${10%4}/td
td${10%4}/td
  /tr
  tr
-   td${'${'}10 mod 4}/td
+   td\${10 mod 4}/td
td${10 mod 4}/td
  /tr
+%-- XXX - NOT YET IMPLEMENTED
+  tr
+td\${(1==2) ? 3 : 4}/td
+td${(1==2) ? 3 : 4}/td
+  /tr
+--%
/table
   /code
 /blockquote
Index: jsr152/examples/jsp2/el/basic-arithmetic.txt
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/examples/jsp2/el/basic-arithmetic.txt,v
retrieving revision 1.1
diff -u -r1.1 basic-arithmetic.txt
--- jsr152/examples/jsp2/el/basic-arithmetic.txt7 Sep 2002 00:47:59 -  
 1.1
+++ jsr152/examples/jsp2/el/basic-arithmetic.txt19 Mar 2003 03:39:43 -
@@ -18,49 +18,55 @@
tdbResult/b/td
  /thead
  tr
-   td${'${'}1}/td
+   td\${1}/td
td${1}/td
  /tr
  tr
-   td${'${'}1 + 2}/td
+   td\${1 + 2}/td
td${1 + 2}/td
  /tr
  tr
-   td${'${'}1.2 + 2.3}/td
+   td\${1.2 + 2.3}/td
td${1.2 + 2.3}/td
  /tr
  tr
-   td${'${'}1.2E4 + 1.4}/td
+   td\${1.2E4 + 1.4}/td
td${1.2E4 + 1.4}/td
  /tr
  tr
-   td${'${'}-4 - 2}/td
+   td\${-4 - 2}/td
td${-4 - 2}/td
  /tr
  tr
-   td${'${'}21 * 2}/td
+   td\${21 * 2}/td
td${21 * 2}/td
  /tr
  tr
-   td${'${'}3/4}/td
+   td\${3/4}/td
td${3/4}/td
  /tr
  tr
-   td${'${'}3 div 4}/td
+   td\${3 div 4}/td
td${3 div 4}/td
  /tr
  tr
-   td${'${'}3/0}/td
+   td\${3/0}/td
td${3/0}/td
  /tr
  tr
-   td${'${'}10%4}/td
+   td\${10%4}/td
td${10%4}/td
  /tr
  tr
-   td${'${'}10 mod 4}/td
+   td\${10 mod 4}/td
td${10 mod 4}/td
  /tr
+%-- XXX - NOT YET IMPLEMENTED
+  tr
+td\${(1==2) ? 3 : 4}/td
+td${(1==2) ? 3 : 4}/td
+  /tr
+--%
/table
   /code
 /blockquote
Index: jsr152/examples/jsp2/el/basic-comparisons.jsp
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/examples/jsp2/el/basic-comparisons.jsp,v
retrieving revision 1.1
diff -u -r1.1 basic-comparisons.jsp
--- jsr152/examples/jsp2/el/basic-comparisons.jsp   7 Sep 2002 00:47:59 -  
 1.1
+++ jsr152/examples/jsp2/el/basic-comparisons.jsp   19 Mar 2003 03:39:43 -
@@ -24,51 +24,51 @@
tdbResult/b/td
  /thead
  tr
-   td${'${'}1 lt; 2}/td
+   td\${1 lt; 2}/td
td${1  2}/td
  /tr
  tr
-   td${'${'}1 lt 2}/td
+   td\${1 lt 2}/td
td${1 lt 2}/td
  /tr
  tr
-   td${'${'}1 gt; 

[PATCH] jakarta-servletapi-5: API updates

[Yutaka Yoshida]

Hi,

The attached file is updates to the Servlet 2.4 API and XML Schema.
Changes are:

jsr154/src/share/dtd/web-app_2_4.xsd
- Arbitrary order of sub elements under web-app
- Reformatted indentation

jsr154/src/share/javax/servlet/ServletContext.java
- Change 2.3 to 2.4 in getMajorVersion() and getMinorVersion()

jsr154/src/share/javax/servlet/ServletContextAttributeListener.java
- Fix typo

jsr154/src/share/javax/servlet/ServletContextListener.java
- Clarification of contextInitialized() and contextDestroyed()

jsr154/src/share/javax/servlet/ServletRequest.java
- Clarification of getServerName(), getServerPort(), getRemoteAddr()
  getRemoteHost(), getRequestDispatcher()
- Add @return in the latest addition of getLocaleName(), getLocalAddr(),
  and getLocalPort()

jsr154/src/share/javax/servlet/ServletRequestWrapper.java
- Fix the inappropriate comments of the getLocalName(), getLocalAddr(),
  and getLocalPort()

jsr154/src/share/javax/servlet/ServletResponse.java
- Internationalization clarification

jsr154/src/share/javax/servlet/SingleThreadModel.java
- Deprecate SingleThreadModel

jsr154/src/share/javax/servlet/http/HttpServlet.java
- Change the URL of HTTP/1.1 to RFC2616

jsr154/src/share/javax/servlet/http/HttpServletRequest.java
- Allow vendor specific auth type in getAuthType()
- Clarification of getHeader(), getPathInfo(), getPathTranslated(),
  getRequestedSessionId(), getServletPath()

jsr154/src/share/javax/servlet/http/HttpServletResponse.java
- Clarification of sendError()
- Add recommendation of RFC2047 in setHeader() and addHeader()

jsr154/src/share/javax/servlet/http/HttpSessionListener.java
- Change the sessionDestroyed() to notify *before* the session
  is invalidated.

--
Yutaka Yoshida
Java/XML Software Group
Sun Microsystems Inc.


Index: jsr154/src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.8
diff -u -r1.8 web-app_2_4.xsd
--- jsr154/src/share/dtd/web-app_2_4.xsd14 Feb 2003 19:34:44 -  1.8
+++ jsr154/src/share/dtd/web-app_2_4.xsd5 Mar 2003 03:33:16 -
@@ -8,7 +8,7 @@
version=2.4
   xsd:annotation
 xsd:documentation
-  @(#)web-app_2_4.xsds 1.54 03/02/11
+  @(#)web-app_2_4.xsds 1.55 03/02/19
 /xsd:documentation
   /xsd:annotation
 
@@ -109,7 +109,19 @@
   xsd:documentation
 
The web-app element is the root of the deployment
-   descriptor for a web application.
+   descriptor for a web application.  Note that the sub-elements
+   of this element can be in the arbitrary order. Because of
+   that, the multiplicity of the elements of distributable,
+   session-config, welcome-file-list, jsp-config, login-config,
+   and locale-encoding-mapping-list was changed from ? to *
+   in this schema.  However, the deployment descriptor instance
+   file must not contain multiple elements of session-config,
+   jsp-config, and login-config. When there are multiple elements of
+   welcome-file-list or locale-encoding-mapping-list, the container
+   must concatinate the element contents.  The multiple occurance
+   of the element distributable is redundant and the container
+   treats that case exactly in the same way when there is only
+   one distributable.
 
   /xsd:documentation
 /xsd:annotation
@@ -1119,14 +1131,13 @@
 
   xsd:complexType name=web-appType
 
-xsd:sequence
+xsd:choice minOccurs=0 maxOccurs=unbounded
   xsd:group ref=j2ee:descriptionGroup/
   xsd:element name=distributable
-  type=j2ee:emptyType
-  minOccurs=0/
+  type=j2ee:emptyType/
   xsd:element name=context-param
-  type=j2ee:param-valueType
-  minOccurs=0 maxOccurs=unbounded
+  type=j2ee:param-valueType
+
xsd:annotation
  xsd:documentation
 
@@ -1139,62 +1150,37 @@
   /xsd:element
 
   xsd:element name=filter
-  type=j2ee:filterType
-  minOccurs=0 maxOccurs=unbounded/
+  type=j2ee:filterType/
   xsd:element name=filter-mapping
-  type=j2ee:filter-mappingType
-  minOccurs=0
-  maxOccurs=unbounded/
+  type=j2ee:filter-mappingType/
   xsd:element name=listener
-  type=j2ee:listenerType
-  minOccurs=0
-  maxOccurs=unbounded/
+  type=j2ee:listenerType/
   xsd:element name=servlet
-  type=j2ee:servletType
-  minOccurs=0
-  maxOccurs=unbounded/
+  type=j2ee:servletType/
   xsd:element name=servlet-mapping
-  type=j2ee:servlet-mappingType

[PATCH] jakarta-servletapi-5: Latest JSP 2.0 updates

[Mark Roth]

/jsr152/src/share/javax/servlet/jsp/JspContext.java:
- Added throws clause for NullPointerException for null
  name parameter to the following methods:
  findAttribute( name )
  removeAttribute( name )
  removeAttribute( name, scope )
  getAttributesScope( name )
/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
- We now allow null to be passed for defaultPrefix for cases where
  a function must have a prefix.
/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Updated part of the description of the taglib element
  Before:
The taglib element contains tag elements.
  After:
The taglib element contains, among other
things, tag and tag-file elements.
- Removed tag-file-name-uniqueness constraint
- Upgraded tag-name-uniqueness constraint to check
  uniqueness across both tag and tag-file elements.
  (Xerces has a bug that causes this not to work, yet
  but this should work, according to Kohsuke and
  Norm)
- langage -- language
- Removed uppercase versions of body-content types,
  TAGDEPENDENT, EMPTY, and SCRIPTLESS
- Renamed j2ee:tag-extensionType to
  j2ee:tld-extensionType
- Removed references to old mustUnderstand attribute
- Added function-extension element for extension of
  function elements in addition to taglib and tag
  elements.
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.9
diff -u -r1.9 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  14 Feb 2003 19:34:43 - 
 1.9
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  3 Mar 2003 02:24:02 -
@@ -10,7 +10,7 @@
 
   xsd:annotation
 xsd:documentation
-  @(#)web-jsptaglibrary_2_0.xsds   1.31 02/11/03
+  @(#)web-jsptaglibrary_2_0.xsds   1.32 03/02/03
 /xsd:documentation
   /xsd:annotation
   xsd:annotation
@@ -99,25 +99,13 @@
   xsd:annotation
xsd:documentation
 
- The taglib element contains tag elements.
+ The taglib element contains, among other things, tag and
+ tag-file elements.
  The name subelements of these elements must each be unique.
 
/xsd:documentation
   /xsd:annotation
-  xsd:selector xpath=j2ee:tag/
-  xsd:fieldxpath=j2ee:name/
-/xsd:unique
-
-xsd:unique name=tag-file-name-uniqueness
-  xsd:annotation
-   xsd:documentation
-
- The taglib element contains tag-file elements.
- The name subelements of these elements must each be unique.
-
-   /xsd:documentation
-  /xsd:annotation
-  xsd:selector xpath=j2ee:tag-file/
+  xsd:selector xpath=j2ee:tag|j2ee:tag-file/
   xsd:fieldxpath=j2ee:name/
 /xsd:unique
 
@@ -150,7 +138,7 @@
 
tagdependentThe body of the tag is interpreted by the tag
implementation itself, and is most likely
-   in a different langage, e.g embedded SQL
+   in a different language, e.g embedded SQL
statements.
 
JSP The body of the tag contains nested JSP
@@ -168,12 +156,9 @@
 xsd:simpleContent
   xsd:restriction base=j2ee:string
xsd:enumeration value=tagdependent/
-   xsd:enumeration value=TAGDEPENDENT/
xsd:enumeration value=JSP/
xsd:enumeration value=empty/
-   xsd:enumeration value=EMPTY/
xsd:enumeration value=scriptless/
-   xsd:enumeration value=SCRIPTLESS/
   /xsd:restriction
 /xsd:simpleContent
   /xsd:complexType
@@ -227,6 +212,10 @@
example Optional informal description of an
example of a use of this function
 
+   function-extension  Zero or more extensions that provide extra
+   information about this function, for tool
+   consumption
+
   /xsd:documentation
 /xsd:annotation
 
@@ -308,6 +297,19 @@
/xsd:annotation
 
   /xsd:element
+  xsd:element name=function-extension
+  type=j2ee:tld-extensionType
+  minOccurs=0
+  maxOccurs=unbounded
+   xsd:annotation
+ xsd:documentation
+
+   Function extensions are for tool use only and must not affect
+   the behavior of a container.
+
+ /xsd:documentation
+   /xsd:annotation
+  /xsd:element
 /xsd:sequence
 xsd:attribute name=id type=xsd:ID/
   /xsd:complexType
@@ -344,41 +346,6 @@
 
 !--  --
 
-  xsd:complexType name=tag-extensionType
-xsd:annotation
-  

[PATCH] jakarta-servletapi-5: API updates

[Mark Roth]

Attached are updates to the JSP 2.0 API and XML Schema files, in gzipped 
format (was too large for tomcat-dev in raw form).

/jsr152/src/share/javax/servlet/jsp/JspContext.java
 - Added throws clause for IllegalArgumentException to setAttribute()
   for when PageContext.SESSION_SCOPE is specified but the requested
   page does not participate in a session.
 - Added throws clause for IllegalArgumentException to getAttribute(
   name, scope ) for when PageContext.SESSION_SCOPE is specified but
   the requested page does not participate in a session.
 - Added throws clause for IllegalArgumentException to
   removeAttribute( name, scope ) for when PageContext.SESSION_SCOPE
   is specified but the requested page does not participate in
   a session.
 - Added throws clause for IllegalArgumentException to
   getAttributeNamesInScope( scope ) for when
   PageContext.SESSION_SCOPE is specified but the requested page
   does not participate in a session.

/jsr152/src/share/dtd/jsp_2_0.xsd:
/jsr154/src/share/dtd/jsp_2_0.xsd:
 - Reformatted indentation

/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
 - Moved definitions of j2ee:extensibleType and
   j2ee:tag-extensionType to web-jsptaglibrary_2_0.xsd.
 - Reformatted indentation.
 - Updated EBNF for function-signature element
 - Updated description of version attribute that there is no
   default value.
 - Updated description of tag and tag-file elements to indicate
   that they are not one or more but zero or more.

/jsr154/src/share/dtd/j2ee_1_4.xsd:
/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd:
/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd:
/jsr154/src/share/dtd/jsp_2_0.xsd
/jsr154/src/share/dtd/web-app_2_4.xsd
 - Updated to the latest, including reformatted indentation.

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.



jakarta-servletapi-5.patch.txt.gz
Description: application/gzip
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5

[Mark Roth]

jsr152/src/share/javax/servlet/jsp/tagext/SkipPageException.java
- Made clear that this should not be thrown from within a tag file.

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Added some useful subelements to tag-file element:
	* description
	* display-name
	* icon
* example
	* tag-extension

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.

Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.7
diff -u -r1.7 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  28 Jan 2003 00:19:10 - 
 1.7
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  3 Feb 2003 19:05:56 -
@@ -10,7 +10,7 @@
 
 xsd:annotation
 xsd:documentation
-@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
+%W% %G%
 /xsd:documentation
 /xsd:annotation
 xsd:annotation
@@ -334,23 +334,69 @@
 
 The tag-file element has two required subelements:
 
-nameThe unique action name
+description   Optional tag-specific information
 
-pathWhere to find the .tag file implementing this
-action, relative to the root of the web application or
-   the root of the JAR file for a tag library packaged in
-   a JAR.  This must begin with /WEB-INF/tags if the .tag
-   file resides in the WAR, or /META-INF/tags if the .tag
-   file resides in a JAR.
+display-name  A short name that is intended to be
+  displayed by tools
+
+icon  Optional icon element that can be used
+  by tools
+
+name  The unique action name
+
+path  Where to find the .tag file implementing this
+  action, relative to the root of the web application or
+ the root of the JAR file for a tag library packaged in
+ a JAR.  This must begin with /WEB-INF/tags if the .tag
+ file resides in the WAR, or /META-INF/tags if the .tag
+ file resides in a JAR.
+
+example   Optional informal description of an
+  example of a use of this tag
+
+tag-extension Zero or more extensions that provide extra
+ information about this tag, for tool
+ consumption
 
 /xsd:documentation
 /xsd:annotation
 
 xsd:sequence
+xsd:group ref=j2ee:descriptionGroup/
 xsd:element name=name
  type=j2ee:tld-canonical-nameType/
 xsd:element name=path
  type=j2ee:pathType/
+xsd:element name=example
+ type=j2ee:xsdStringType
+ minOccurs=0
+xsd:annotation
+xsd:documentation
+
+The example element contains an informal description
+of an example of the use of a tag.
+
+/xsd:documentation
+/xsd:annotation
+
+/xsd:element
+   xsd:element name=tag-extension
+type=j2ee:deployment-extensionType
+minOccurs=0
+maxOccurs=unbounded
+   xsd:annotation
+   xsd:documentation
+
+Tag extensions are for tool use only and must not affect
+   the behavior of a container.  The TLD extension mechanism
+   only allows ignorable extensions (i.e. those without a
+   mustUnderstand attribute).  A Tag Library is considered
+   invalid if it requires an extension that must be
+   understood by setting mustUnderstand=true.
+
+   /xsd:documentation
+   /xsd:annotation
+   /xsd:element
 /xsd:sequence
 xsd:attribute name=id type=xsd:ID/
 /xsd:complexType
Index: jsr152/src/share/javax/servlet/jsp/SkipPageException.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java,v
retrieving revision 1.3
diff -u -r1.3 SkipPageException.java
--- jsr152/src/share/javax/servlet/jsp/SkipPageException.java   29 Oct 2002 01:18:11 
-  1.3
+++ jsr152/src/share/javax/servlet/jsp/SkipPageException.java   3 Feb 2003 19:05:56 
+-
@@ -62,7 +62,7 @@
  * the case with tag files).  The effect is similar to that of a 
  * Classic Tag Handler returning Tag.SKIP_PAGE from doEndTag().
  * Jsp Fragments may also throw this exception.  This exception
- * should not be thrown manually in a JSP page - the behavior is
+ * should not be thrown manually in a JSP page or tag file - the behavior is
  * undefined.  The exception is intended to be thrown inside 
  * SimpleTag handlers and in JSP fragments.
  * 
Index: jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v

[PATCH] jakarta-servletapi-5: javadoc enhancements

[Mark Roth]

Javadoc enhancements for JSP 2.0 API.

New Files (attached separately):
- jsr152/src/share/javax/servlet/jsp/package.html
- jsr152/src/share/javax/servlet/jsp/el/package.html
- jsr152/src/share/javax/servlet/jsp/tagext/package.html

jsr152/src/share/javax/servlet/jsp/JspContext.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/JspEngineInfo.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/JspFactory.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/PageContext.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
- Added description for doInitBody() @throws JspException

jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Added description for doAfterBody() @throws JspException

jsr152/src/share/javax/servlet/jsp/tagext/PageData.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/tagext/SimpleTagSupport.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- Added javadoc comment for public no-args constructor

jsr152/src/share/javax/servlet/jsp/tagext/TryCatchFinally.java
- Added @throws Throwable tag for doCatch()

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.

Index: jsr152/src/share/javax/servlet/jsp/JspContext.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java,v
retrieving revision 1.6
diff -u -r1.6 JspContext.java
--- jsr152/src/share/javax/servlet/jsp/JspContext.java  18 Dec 2002 18:35:37 - 
 1.6
+++ jsr152/src/share/javax/servlet/jsp/JspContext.java  29 Jan 2003 21:01:27 -
@@ -109,6 +109,13 @@
 
 public abstract class JspContext {
 
+/**
+ * Sole constructor. (For invocation by subclass constructors, 
+ * typically implicit.)
+ */
+public JspContext() {
+}
+
 /** 
  * Register the name and value specified with page scope semantics.
  * If the value passed in is codenull/code, this has the same 
Index: jsr152/src/share/javax/servlet/jsp/JspEngineInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspEngineInfo.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 JspEngineInfo.java
--- jsr152/src/share/javax/servlet/jsp/JspEngineInfo.java   13 Aug 2002 16:20:54 
-  1.1.1.1
+++ jsr152/src/share/javax/servlet/jsp/JspEngineInfo.java   29 Jan 2003 21:01:27 
+-
@@ -61,6 +61,13 @@
  */
 
 public abstract class JspEngineInfo {
+
+/**
+ * Sole constructor. (For invocation by subclass constructors, 
+ * typically implicit.)
+ */
+public JspEngineInfo() {
+}
 
 /**
  * Return the version number of the JSP specification that is supported by
Index: jsr152/src/share/javax/servlet/jsp/JspFactory.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspFactory.java,v
retrieving revision 1.2
diff -u -r1.2 JspFactory.java
--- jsr152/src/share/javax/servlet/jsp/JspFactory.java  19 Aug 2002 16:29:49 - 
 1.2
+++ jsr152/src/share/javax/servlet/jsp/JspFactory.java  29 Jan 2003 21:01:27 -
@@ -82,6 +82,13 @@
 public abstract class JspFactory {
 
 private static JspFactory deflt = null;
+
+/**
+ * Sole constructor. (For invocation by subclass constructors, 
+ * typically implicit.)
+ */
+public JspFactory() {
+}
 
 /**
  * p
Index: jsr152/src/share/javax/servlet/jsp/PageContext.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java,v
retrieving revision 1.6
diff -u -r1.6 PageContext.java
--- jsr152/src/share/javax/servlet/jsp/PageContext.java 18 Dec 2002 18:35:37 - 
 1.6
+++ jsr152/src/share/javax/servlet/jsp/PageContext.java 29 Jan 2003 21:01:28 -
@@ -132,7 +132,14 @@
 abstract public class PageContext 
 extends JspContext
 {
-
+
+/**
+ * Sole constructor. (For invocation by subclass constructors, 
+ * typically implicit.)
+ */
+public PageContext() {
+}
+
 /**
  * Page scope: (this is the default) the named reference remains available
  * in this PageContext until the return from the current Servlet.service()
Index: jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
===

[PATCH] jakarta-servletapi-5: Minor javadoc updates

[Mark Roth]

Final API patch before PFD2 release of JSP 2.0 specification.

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Updated description for function-signature element

jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Updated description for function-signature element

jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java
- Changed description of prefix parameter to resolveFunction
	( means no prefix)

jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
- Changed description of defaultPrefix parameter to resolveFunction
	( means the default is no prefix)
- Changed description of defaultPrefix parameter to evaluate
	( means the default is no prefix)

jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
- Changed javadocs for setJspBody().  null is no longer passed
	if the body is empty.  Instead, setJspBody() is not called.

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.

Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.6
diff -u -r1.6 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  8 Nov 2002 21:30:20 -  
 1.6
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  24 Jan 2003 18:45:52 -
@@ -10,7 +10,7 @@
 
 xsd:annotation
 xsd:documentation
-@(#)web-jsptaglibrary_2_0.xsds 1.24 11/01/02
+@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
 /xsd:documentation
 /xsd:annotation
 xsd:annotation
@@ -52,8 +52,8 @@
 xsd:documentation
 ![CDATA[
 
-This is the XML Schema for the JSP Taglibrary deployment
-descriptor.  All Taglibrary deployment descriptors must
+This is the XML Schema for the JSP Taglibrary
+descriptor.  All Taglibrary descriptors must
 indicate the tag library schema by using the Taglibrary
 namespace:
 
@@ -243,9 +243,30 @@
 xsd:annotation
 xsd:documentation
 
-Provides the signature, as in the Java Language
-Specification, of the static Java method that is
-to be used to implement the function.
+Provides the signature, of the static Java method that is
+to be used to implement the function.  The syntax of the
+   function-signature element is as follows:
+
+   FunctionSignature ::= ReturnType S MethodName S?
+ '(' S? Parameters? S? ')'
+
+ReturnType::= ClassName
+
+   MethodName::= Identifier
+
+   Parameters::=   Parameter
+ | ( Parameter S? ',' S? Parameters )
+
+Parameter ::= ClassName
+
+   Where:
+
+   * ClassName is a fully qualified Java class name
+ (including package name), as per the Java Language
+ Specification.
+
+* Identifier is a Java identifier as per the Java
+ Language Specification.
 
 Example:
 
Index: jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v
retrieving revision 1.6
diff -u -r1.6 ExpressionEvaluator.java
--- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  18 Dec 2002 
18:35:37 -  1.6
+++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  24 Jan 2003 
+18:45:52 -
@@ -104,7 +104,7 @@
  * evaluating it, and must return a consistent value each time
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
- * encountered with no prefix.
+ * encountered with no prefix, or  if the default is no prefix.
  * @return The Expression object encapsulating the arguments.
  *
  * @exception ELException Thrown if parsing errors were found.
@@ -133,7 +133,7 @@
  * evaluating it, and must return a consistent value each time
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
- * encountered with no prefix.
+ * encountered with no prefix, or  if the default is no prefix.
  * @return The result of the expression evaluation.
  *
  * @exception ELException Thrown if the expression evaluation failed.
Index: jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java,v
retrieving revision 1.2
diff -u -r1.2 FunctionMapper.java
--- jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java   29 Oct 2002 01:18:12 
-  1.2
+++ jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java   24 Jan 2003 18:45:52 
+-
@@ -63,20 +63,15 

[PATCH] jakarta-servletapi-5

[Mark Roth]

Small patch to fix some javadocs.

Modified File:

jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java

- Mark

Index: jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java,v
retrieving revision 1.4
diff -u -r1.4 BodyTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java  18 Dec 2002 18:35:37 
-  1.4
+++ jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java  15 Jan 2003 16:32:54 
+-
@@ -96,11 +96,12 @@
  * object, where the JSP Page implementation object will place the
  * evaluation (and reevaluation, if appropriate) of the body.  The setter
  * method (setBodyContent) will only be invoked if doStartTag() returns
- * EVAL_BODY_BUFFERED and the corresponding action element is not empty.
+ * EVAL_BODY_BUFFERED and the corresponding action element does not have
+ * an empty body.
  *
  * pBMethods/B
  * p In addition to the setter method for the bodyContent property, there
- * is a new action methods: doInitBody(), which is invoked right after
+ * is a new action method: doInitBody(), which is invoked right after
  * setBodyContent() and before the body evaluation.  This method is only
  * invoked if doStartTag() returns EVAL_BODY_BUFFERED.
  *


--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5

[Mark Roth]

Attached are some fixes leading up to our second proposed final draft 
release of the specification.  Please let me know if there are any 
questions or concerns.

jsr152/src/share/dtd/jsp_2_0.xsd
  - Updated comments for jsp-property-groupType

jsr154/src/share/dtd/jsp_2_0.xsd
  - Updated comments for jsp-property-groupType

jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
  - Fixed typo: 'the the'

jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
  - Fixed typo: 'AT_NESTED' -- 'NESTED'
  - Fixed table - AT_BEGIN and NESTED should be synchronized
after doStartTag() if EVAL_BODY_INCLUDE is returned.

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
? jsr152/src/share/javax/servlet/jsp/JspException.class
? jsr152/src/share/javax/servlet/jsp/JspWriter.class
? jsr152/src/share/javax/servlet/jsp/.nbattrs
? jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.class
Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.5
diff -u -r1.5 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd8 Nov 2002 21:30:20 -   1.5
+++ jsr152/src/share/dtd/jsp_2_0.xsd8 Jan 2003 22:42:10 -
@@ -8,7 +8,7 @@
  version=2.0
 xsd:annotation
 xsd:documentation
-@(#)jsp_2_0.xsds   1.14 11/06/02
+@(#)jsp_2_0.xsds   1.15 01/02/03
 /xsd:documentation
 /xsd:annotation
 
@@ -136,10 +136,10 @@
 All files so described are deemed to be JSP files.  The
 following additional properties can be described:
 
-- Control enabling of EL evaluation.
-- Control enabling of Scripting elements.
+- Control whether EL is ignored
+- Control whether scripting elements are invalid
 - Indicate pageEncoding information.
-- Indicating that a resource is a JSP document
+- Indicate that a resource is a JSP document (XML)
 - Prelude and Coda automatic includes.
 
 /xsd:documentation
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.4
diff -u -r1.4 TagInfo.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  4 Nov 2002 17:44:24 
-   1.4
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  8 Jan 2003 22:42:10 
+-
@@ -268,7 +268,7 @@
  *
  * @param data TagData describing this action.
  * @return if a TagExtraInfo object is associated with this TagInfo, the
- * the result of getTagExtraInfo().getVariableInfo( data ), otherwise
+ * result of getTagExtraInfo().getVariableInfo( data ), otherwise
  * null if the tag has no id attribute or new VariableInfo[] {
  * new VariableInfo( data.getId(), java.lang.Object, true,
  * VariableInfo.NESTED ) } if an id attribute is present.
Index: jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java,v
retrieving revision 1.6
diff -u -r1.6 VariableInfo.java
--- jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java 18 Dec 2002 18:35:37 
-  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java 8 Jan 2003 22:42:10 
+-
@@ -193,9 +193,9 @@
  *   tr
  * td valign=top bgcolor=#c0c0c0bBodyTagbr
  * /b/td
- * td valign=top align=center bgcolor=#ffbr
+ * td valign=top align=center bgcolor=#ffAT_BEGIN, 
+NESTEDsup1/supbr
  * /td
- * td valign=top align=center bgcolor=#ffAT_BEGIN, AT_NESTEDbr
+ * td valign=top align=center bgcolor=#ffAT_BEGIN, 
+NESTEDsup1/supbr
  * /td
  * td valign=top align=center bgcolor=#ffAT_BEGIN, NESTEDbr
  * /td
@@ -220,6 +220,9 @@
  *   /tr
  * /tbody
  * /table
+ * sup1/sup Called after codedoStartTag()/code if 
+ * codeEVAL_BODY_INCLUDE/code is returned, or after 
+ * codedoInitBody()/code otherwise.
  * /blockquote
  *
  * pBVariable Information in the TLD/B
Index: jsr154/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.5
diff -u -r1.5 jsp_2_0.xsd
--- jsr154/src/share/dtd/jsp_2_0.xsd8 Nov 2002 21:30:21 -   1.5
+++ jsr154/src/share/dtd/jsp_2_0.xsd8 Jan 2003 22:42:11 -
@@ -8,7 +8,7 @@
  version=2.0
 xsd:annotation
 xsd:documentation
-@(#)jsp_2_0.xsds   1.14 11/06/02
+@(#)jsp_2_0.xsds   1.15 01/02/03
 /xsd:documentation
 /xsd:annotation
 
@@ -136,10 +136,10 @@
 All files so described are deemed to be JSP files.  The
 following additional properties can be described:
 
-- Control enabling of EL evaluation.
-- 

[PATCH] jakarta-servletapi-5

[Mark Roth]

Attached are a set of API patches leading up to PFD2 of the 
specification.  Look for a corresponding patch to jakarta-tomcat-jasper 
to bring it up to date with these APIs.

Also note the attached replacement for TagProtocol.gif.

jsr152/src/share/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif
- Updated diagram to remove arrow from released state to all
  properties initialized state.
- Moved label [3] to another arrow.

jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
- Removed state transition [3] from class javadocs.
- Added a new [3] label clarifying details about what may be called
  on tag reuse.

jsr152/src/share/javax/servlet/jsp/tagext/TagData.java
- Updated description for getAttribute() to clarify
  REQUEST_TIME_VALUE is returned for any dynamic attribute set
  via jsp:attribute.

jsr152/src/share/javax/servlet/jsp/tagext/JspFragment.java
- for example -- in other words

jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
- Fixed incorrect class comment about variable scope.
- Removed old comment about JLS verbiage.
- Improved description of why 'boxed' types are necessary.

jsr152/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java
- Fixed erroneous comment about only being available in JSP 2.0
  format

jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
- Clarified SimpleTag has the equivalent power of BodyTag but with a
  much simpler lifecycle.

jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Clarified description for return value of SKIP_BODY from
  doAfterBody()

jsr152/src/share/javax/servlet/jsp/PageContext.java
- Fixed class description as some elements were moved to JspContext.

jsr152/src/share/javax/servlet/jsp/JspContext.java
- Fixed class description as some elements were moved from
  PageContext.
- Removed constants PAGE_SCOPE, REQUEST_SCOPE, SESSION_SCOPE and
  APPLICATION_SCOPE as these are duplicated in PageContext.

jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
- Clarified that in a classic tag invocation with an empty body
  (e.g. my:tag/), the body methods are not to be called by the
  container.

jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- A validator operates on the XML view associated with the JSP page,
  not the XML document.

jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java
- Removed pContext parameter from resolveVariable()

jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
- Changed from an interface to an abstract class.

jsr152/src/share/javax/servlet/jsp/el/Expression.java
- Changed from an interface to an abstract class.

---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/JspContext.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java,v
retrieving revision 1.5
diff -u -r1.5 JspContext.java
--- jsr152/src/share/javax/servlet/jsp/JspContext.java  8 Nov 2002 21:30:21 -  
 1.5
+++ jsr152/src/share/javax/servlet/jsp/JspContext.java  18 Dec 2002 02:36:33 -
@@ -84,45 +84,30 @@
  *
  * pBMethods Intended for JSP authors/B
  * p
+ * Some methods provide Buniform access/B to the diverse objects
+ * representing scopes.
+ * The implementation must use the underlying machinery
+ * corresponding to that scope, so information can be passed back and
+ * forth between the underlying environment (e.g. Servlets) and JSP pages.
+ * The methods are:
+ * codesetAttribute()/code,  codegetAttribute()/code,
+ * codefindAttribute()/code,  coderemoveAttribute()/code,
+ * codegetAttributesScope()/code and 
+ * codegetAttributeNamesInScope()/code.
+ * 
+ * p
  * The following methods provide Bconvenient access/B to implicit objects:
- * ul
  * codegetOut()/code
  *
+ * p
+ * The following methods provide Bprogrammatic access/b to the 
+ * Expression Language evaluator:
+ * codegetExpressionEvaluator()/code, codegetVariableResolver()/code
+ *
  * @since 2.0
  */
 
 public abstract class JspContext {
-
-/**
- * Page scope: (this is the default) the named reference remains available
- * in this JspContext until the return from the current Servlet.service()
- * invocation.
- */
-
-public static final int PAGE_SCOPE = 1;
-
-/**
- * Request scope: the named reference remains available from the 
- * ServletRequest associated with the Servlet until the current 
- * request is completed.
- */
-
-public static final int REQUEST_SCOPE  = 2;
-
-/**
- * Session scope (only valid if this page participates in a session):
- * the named reference remains available from the HttpSession (if any)
- * associated with the Servlet until the HttpSession is invalidated.
- */
-
-public static final int 

[PATCH] jakarta-servletapi-5: API changes and clarifications

[Mark Roth]

Here is another set of JSP 2.0 API changes and clarifications, based on 
feedback from various sources.  Please let me know if there are any 
questions or concerns.

jsr152/src/share/javax/servlet/jsp/JspContext.java
  - Clarified that removeAttribute( name ) removes from all scopes
  - Clarified that removeAttribute( name, scope ) does nothing if the
object doesn't exist in that scope.
  - Clarified that setAttribute( name, null ) has the effect of removing
that attribute from the page scope.
  - Clarified that setAttribute( name, null, scope ) has the effect of
removing that attribute from the given scope.

jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java
  - Clarified javadocs for getValues() that the keys are returned.
  - Updated release() method to clear id and values Hashtable

jsr152/src/share/javax/servlet/jsp/tagext/PageData.java
  - Clarified the InputStream returned is in UTF-8

jsr152/src/share/dtd/jspxml.dtd
jsr152/src/share/dtd/jspxml.xsd
jsr154/src/share/dtd/jspxml.dtd
jsr154/src/share/dtd/jspxml.xsd
  - Removed i18n-related comment about contentType default

jsr152/src/share/dtd/jsp_2_0.xsd
jsr154/src/share/dtd/jsp_2_0.xsd
  - Changed i18n-related description relating to encoding name conflicts

jsr154/src/share/dtd/web-app_2_4.xsd
jsr154/src/share/dtd/j2ee_1_4.xsd
  - Moved warType from j2ee_1_4.xsd to web-app_2_4.xsd

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.4
diff -u -r1.4 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd9 Oct 2002 17:38:49 -   1.4
+++ jsr152/src/share/dtd/jsp_2_0.xsd8 Nov 2002 21:16:38 -
 -8,7 +8,7 
  version=2.0
 xsd:annotation
 xsd:documentation
-%W% %G%
+(#)jsp_2_0.xsds   1.14 11/06/02
 /xsd:documentation
 /xsd:annotation
 
 -172,12 +172,15 
 xsd:documentation
 
 The valid values of page-encoding are those of the
-pageEncoding page directive. It is a
-translation-time error to define the pageEncoding
-of a JSP page through one value in the JSP
-configuration element and then give it a different
-value in a pageEncoding directive, but it is legal
-to give it the same value.
+pageEncoding page directive.  It is a
+   translation-time error to name different encodings
+   in the pageEncoding attribute of the page directive
+   of a JSP page and in a JSP configuration element
+   matching the page.  It is also a translation-time
+   error to name different encodings in the prolog of
+   a document in XML syntax and in a JSP configuration
+   element matching the document.  It is legal to name
+   the same encoding through mulitple mechanisms.
 
 /xsd:documentation
 /xsd:annotation
Index: jsr152/src/share/dtd/jspxml.dtd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 jspxml.dtd
--- jsr152/src/share/dtd/jspxml.dtd 13 Aug 2002 16:20:58 -  1.1.1.1
+++ jsr152/src/share/dtd/jspxml.dtd 8 Nov 2002 21:16:38 -
 -1,4 +1,4 
-!-- DTD for JSP 1.2
+!-- DTD for JSP 2.0
  thanks to Bob Foster, WebGain
 --
 
 -77,12 +77,6 
 
 
 !ELEMENT jsp:directive.page EMPTY
-!--
-The contentType default is not relevant for XML views of
-JSP pages since it differs depending on the originating
-syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
-text/xml;UTF-8 for JSP Documents in XML syntax.
---
 !ATTLIST jsp:directive.page
 languageCDATA   java
 extends %ClassName; #IMPLIED
 -96,8 +90,7 
 errorPage   %URL;   #IMPLIED
 isErrorPage %Bool;  false
 pageEncodingCDATA   #IMPLIED
-isScriptingEnabled %Bool;   true
-isELEnabled %Bool;  #IMPLIED
+isELIgnored %Bool;  #IMPLIED
 
 
 !-- the jsp:directive.include only appears in JSP documents and does
Index: jsr152/src/share/dtd/jspxml.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.xsd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 jspxml.xsd
--- jsr152/src/share/dtd/jspxml.xsd 13 Aug 2002 16:20:58 -  1.1.1.1
+++ jsr152/src/share/dtd/jspxml.xsd 8 Nov 2002 21:16:57 -
 -29,7 +29,7 
 
   xsd:annotation
 xsd:documentation
-  XML Schema for JSP 1.2.
+  XML Schema for JSP 2.0.
 
   This schema is based upon the recent (May 5th, 2001)
   W3C recommendation for XML Schema.
 -210,7 +210,7 
   xsd:simpleType name = ContentType
 xsd:annotation
   xsd:documentation
-Contetn Type for this 

[PATCH] jakarta-servletapi-5: javadoc clarifications

[Mark Roth]

Here is a patch with some more javadoc clarifications, to make the API 
more testable.  Thanks go to Ryan Lubke for helping out!

As always, please let me know if there are any questions or concerns.

Change summary:
---

jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
  - Fixed incorrect wording from last patch, for variable
synchronization.

jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java
  - Fixed wording to preserve forwards compatibility for existing TEI
implementations.

jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
  - Fixed default implementation of getVariableInfo() to return a
variable for the id attribute, if specified.
Clarified intent in javadocs.

jsr152/src/share/javax/servlet/jsp/tagext/TagData.java
  - Fixed getId() description, as we're not returning the jsp:id in this
case.

jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
  - Clarified javadocs w.r.t. variable synchronization

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
  - Removed fragment element under variable element, as fragment-scoped
variables are no longer supported.

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java,v
retrieving revision 1.2
diff -u -r1.2 BodyTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java  29 Oct 2002 01:18:12 
-  1.2
+++ jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java  2 Nov 2002 01:12:50 
+-
 -200,9 +200,9 
  * tags whose doStartTag() method returns SKIP_BODY or EVAL_BODY_INCLUDE.
  *
  * p
- * The JSP container will resynchronize any variable values that 
- * are indicated as so in TagExtraInfo or TLD after the invocation of 
- * doInitBody().
+ * The JSP container will resynchronize the values of any AT_BEGIN and
+ * NESTED variables (defined by the associated TagExtraInfo or TLD) after
+ * the invocation of doInitBody().
  *
  * throws JspException
  * see #doAfterBody
Index: jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v
retrieving revision 1.2
diff -u -r1.2 IterationTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 29 Oct 2002 01:18:12 
-  1.2
+++ jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 2 Nov 2002 01:12:54 
+-
 -138,9 +138,9 
  * of external computation.
  *
  * p
- * The JSP container will resynchronize any variable values that are 
- * indicated as so in TagExtraInfo or TLD after the invocation of 
- * doAfterBody().
+ * The JSP container will resynchronize the values of any AT_BEGIN and
+ * NESTED variables (defined by the associated TagExtraInfo or TLD) after
+ * the invocation of doAfterBody().
  *
  * return whether additional evaluations of the body are desired
  * throws JspException
Index: jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java,v
retrieving revision 1.3
diff -u -r1.3 SimpleTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java29 Oct 2002 01:18:12 
-  1.3
+++ jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java2 Nov 2002 01:12:54 
+-
 -111,6 +111,11 
  * Called by the container to invoke this tag.
  * The implementation of this method is provided by the tag library
  * developer, and handles all tag processing, body iteration, etc.
+ *
+ * p
+ * The JSP container will resynchronize any AT_BEGIN and AT_END
+ * variables (defined by the associated tag file, TagExtraInfo, or TLD)
+ * after the invocation of doTag().
  * 
  * throws javax.servlet.jsp.JspException If an error occurred 
  * while processing this tag.
Index: jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/Tag.java,v
retrieving revision 1.3
diff -u -r1.3 Tag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/Tag.java  29 Oct 2002 01:18:12 - 
 1.3
+++ jsr152/src/share/javax/servlet/jsp/tagext/Tag.java  2 Nov 2002 01:12:54 -
 -243,9 +243,11 
  * implements 

[PATCH] jakarta-servletapi-5: javadoc tightening and cleanup

[Mark Roth]

This is a rather large patch to the API workspace.  Much of it is 
cosmetic changes and tightening of the javadocs so that the APIs are 
more testable.  We also removed some newer APIs we don't need anymore.

Ryan Lubke helped with some of these changes.  Thanks, Ryan!

No files added or deleted.  Change summary:

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Clarified description of path element for tag-file.
- Clarified description of variableType w.r.t. TagExtraInfo classes

jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryInfo.java
- Removed getTagdir(), which is useless
- Removed corresponding tagdir protected attribute
- Removed JSP 2.0 constructor, which was only unique in that
  it took a tagdir parameter.

jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
- Clarified synchronization must be done for both variables declared
  in both TEI and TLD.

jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
- Clarified synchronization must be done for both variables declared
  in both TEI and TLD.

jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Clarified synchronization must be done for both variables declared
  in both TEI and TLD.

jsr152/src/share/javax/servlet/jsp/tagext/TagData.java
- Tightened up description of getId(), as the jsp:id attribute is
  now required to be generated as per JSP.6.2.13.

jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java
- TagExtraInfo.getVariableInfo() [if no variables, can return
  null or [0], default abstract class returns [0]
  (zero-length array).
  NOTE: It is a (translation time) error for a
  tag definition in a TLD with one or more variable subelements
  to have an associated TagExtraInfo implementation that returns
  a VariableInfo array with one or more elements from a call
  to getVariableInfo().  The previous version of the spec was not
  clear on this.]

jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- TagInfo.getAttributes() must return zero-length array if no
  attributes.
- TagInfo.getVariableInfo() must return zero-length array if
  associated TagExtraInfo defines no variables
- TagInfo.getTagVariableInfos() must return zero-length array
  if no variables have been delcared.
- TagInfo.getTagName() returns null if not defined
- TagInfo.getBodyContent() if bodycontent not defined,
  JSP is returned
- TagInfo.getInfoString() if not defined, null is returned
- TagInfo.getDisplayName() if not defined, null is returned
- TagInfo.getSmallIcon() if not defined, null is returned
- TagInfo.getLargeIcon() if not defined, null is returned

jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryInfo.java
- TagLibraryInfo.getTags() if tag library contains no tags, a
  zero-length array must be returned.
- TagLibraryInfo.getTagFiles() if tag library contains no tag
  files, a zero-length array must be returned.
- TagLibraryInfo.getTag() if no such tag is found, null is returned
- TagLibraryInfo.getTagFile() if no such tag files is found, null
  is returned
- TagLibraryInfo.getFunctions() if no fuctions defined, a
  zero-length array is returned.
- TagLibraryInfo.getFunction() if no function exists, null
  is returned

jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
- Clarified description for when to syncrhonize variables.

jsr152/src/share/javax/servlet/jsp/SkipPageException.java
- Clarified that SkipPageException is only to be used in
  JSP Fragments and SimpleTag handlers.

jsr152/src/share/javax/servlet/jsp/PageContext.java
- Removed SecurityException javadocs for both handlePageException()
  methods, as their include() and forward() counterparts no longer
  declare this exception.

jsr152/src/share/javax/servlet/jsp/JspFragment.java
- Clarified how to pass variables to/from JspFragments.

Includes Minor Cosmetic changes
---
  - jsr152/src/share/javax/servlet/jsp/ErrorData.java
  - jsr152/src/share/javax/servlet/jsp/JspContext.java
  - jsr152/src/share/javax/servlet/jsp/JspException.java
  - jsr152/src/share/javax/servlet/jsp/JspWriter.java
  - jsr152/src/share/javax/servlet/jsp/PageContext.java
  - jsr152/src/share/javax/servlet/jsp/SkipPageException.java
  - jsr152/src/share/javax/servlet/jsp/el/ELException.java
  - jsr152/src/share/javax/servlet/jsp/el/ELParseException.java
  - jsr152/src/share/javax/servlet/jsp/el/Expression.java
  - jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java
  - jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java
  - jsr152/src/share/javax/servlet/jsp/tagext/BodyContent.java
  - jsr152/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java
  - jsr152/src/share/javax/servlet/jsp/tagext/DynamicAttributes.java
  - jsr152/src/share/javax/servlet/jsp/tagext/FunctionInfo.java
  - 

[PATCH][jakarta-servletapi-5/jsr152] Documentation Patch

[Ryan Lubke]

Update to clarify return values of TagVariableInfo.

 - getClassName() will return java.lang.String if
   the variable-class element is not specified.

 - getDeclare() will return true if the declare
   element is not specified.

 - getScope() will return NESTED as the scope if
   scope is not specified.






Index: TagVariableInfo.java
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java,v
retrieving revision 1.2
diff -u -r1.2 TagVariableInfo.java
--- TagVariableInfo.java	19 Aug 2002 16:29:51 -	1.2
+++ TagVariableInfo.java	10 Oct 2002 01:02:08 -
@@ -139,7 +139,8 @@
 /**
  * The body of the lt;variable-classgt; element.  
  *
- * @return The name of the class of the variable
+ * @return The name of the class of the variable or
+ * 'java.lang.String' if not defined in the TLD.
  */
 
 public String getClassName() {
@@ -149,7 +150,8 @@
 /**
  * The body of the lt;declaregt; element
  *
- * @return Whether the variable is to be declared or not
+ * @return Whether the variable is to be declared or not.
+ * If not defined in the TLD, 'true' will be returned.
  */
 
 public boolean getDeclare() {
@@ -159,7 +161,9 @@
 /**
  * The body of the lt;scopegt; element
  *
- * @return The scope to give the variable.
+ * @return The scope to give the variable.  NESTED
+ * scope will be returned if not defined in 
+ * the TLD.
  */
 
 public int getScope() {



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH][jakarta-servletapi-5/jsr152] Resubmit of documentation path.

[Ryan Lubke]

Please use the attached patch instead of the one I previously posted.

Changes

TagVariableInfo
  - getClassName() will return java.lang.String if
the variable-class element is not specified.

  - getDeclare() will return true if the declare
element is not specified.

  - getScope() will return NESTED as the scope if
scope is not specified.

TagLibraryInfo

  - Changed the directive from include to taglib in
description of getShortName().

  - Minor rewording of getReliableURN for clarity.



Thanks,

-rl



Index: TagLibraryInfo.java
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryInfo.java,v
retrieving revision 1.3
diff -u -r1.3 TagLibraryInfo.java
--- TagLibraryInfo.java	20 Aug 2002 21:08:24 -	1.3
+++ TagLibraryInfo.java	10 Oct 2002 23:38:29 -
@@ -148,7 +148,7 @@
 /**
  * The preferred short name (prefix) as indicated in the TLD.
  * This may be used by authoring tools as the preferred prefix
- * to use when creating an include directive for this library.
+ * to use when creating an taglib directive for this library.
  *
  * @return the preferred short name for the library
  */
@@ -157,10 +157,9 @@
 }
 
 /**
- * The reliable URN indicated in the TLD.
+ * The reliable URN indicated in the TLD (the uri element).
  * This may be used by authoring tools as a global identifier
- * (the uri attribute) to use when creating a taglib directive
- * for this library.
+ * to use when creating a taglib directive for this library.
  *
  * @return a reliable URN to a TLD like this
  */
Index: TagVariableInfo.java
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java,v
retrieving revision 1.2
diff -u -r1.2 TagVariableInfo.java
--- TagVariableInfo.java	19 Aug 2002 16:29:51 -	1.2
+++ TagVariableInfo.java	10 Oct 2002 23:38:30 -
@@ -139,7 +139,8 @@
 /**
  * The body of the lt;variable-classgt; element.  
  *
- * @return The name of the class of the variable
+ * @return The name of the class of the variable or
+ * 'java.lang.String' if not defined in the TLD.
  */
 
 public String getClassName() {
@@ -149,7 +150,8 @@
 /**
  * The body of the lt;declaregt; element
  *
- * @return Whether the variable is to be declared or not
+ * @return Whether the variable is to be declared or not.
+ * If not defined in the TLD, 'true' will be returned.
  */
 
 public boolean getDeclare() {
@@ -159,7 +161,9 @@
 /**
  * The body of the lt;scopegt; element
  *
- * @return The scope to give the variable.
+ * @return The scope to give the variable.  NESTED
+ * scope will be returned if not defined in 
+ * the TLD.
  */
 
 public int getScope() {



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: XSD change and javadoc clarification

[Mark Roth]

NOTE: This patch requires some changes to Jasper2 before committing. 
Please let me know if there are any questions or concerns.

jsr152/src/share/javax/serlvet/jsp/el/Expression.java
 - Removed null as a return value for error - method must throw an
   exception to signal an error.

jsr152/src/share/dtd/jsp_2_0.xsd:
jsr154/src/share/dtd/jsp_2_0.xsd:
 - As per the Expert Group's decision, changed scripting-enabled to
   scripting-invalid and el-enabled to el-ignored.
   Jasper2 needs to be updated accordingly.

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.


Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.3
diff -u -r1.3 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd20 Sep 2002 01:56:44 -  1.3
+++ jsr152/src/share/dtd/jsp_2_0.xsd9 Oct 2002 00:07:29 -
@@ -8,7 +8,7 @@
  version=2.0
 xsd:annotation
 xsd:documentation
-@(#)jsp_2_0.xsds   1.12 09/18/02
+%W% %G%
 /xsd:documentation
 /xsd:annotation
 
@@ -150,16 +150,17 @@
 xsd:element name=url-pattern
  type=j2ee:url-patternType
  maxOccurs=unbounded/
-xsd:element name=el-enabled
+xsd:element name=el-ignored
  type=j2ee:true-falseType
  minOccurs=0
 xsd:annotation
 xsd:documentation
 
-Can be used to easily set the isELEnabled
+Can be used to easily set the isELIgnored
 property of a group of JSP pages.  By default, the
 EL evaluation is enabled for Web Applications using
-a Servlet 2.4 or greater web.xml.
+a Servlet 2.4 or greater web.xml, and disabled
+   otherwise.
 
 /xsd:documentation
 /xsd:annotation
@@ -181,15 +182,15 @@
 /xsd:documentation
 /xsd:annotation
 /xsd:element
-xsd:element name=scripting-enabled
+xsd:element name=scripting-invalid
  type=j2ee:true-falseType
  minOccurs=0
 xsd:annotation
 xsd:documentation
 
-Can be used to easily set the isScriptingEnabled
-property of a group of JSP pages.  By default,
-scripting is enabled.
+Can be used to easily disable scripting in a
+group of JSP pages.  By default, scripting is
+   enabled.
 
 /xsd:documentation
 /xsd:annotation
Index: jsr152/src/share/javax/servlet/jsp/el/Expression.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java,v
retrieving revision 1.1
diff -u -r1.1 Expression.java
--- jsr152/src/share/javax/servlet/jsp/el/Expression.java   19 Aug 2002 16:29:50 
-  1.1
+++ jsr152/src/share/javax/servlet/jsp/el/Expression.java   9 Oct 2002 00:07:29 
+-
@@ -81,7 +81,7 @@
  *
  * @param vResolver A VariableResolver instance that can be used at runtime to
  *   resolve the name of implicit objects into Objects.
- * @return The result of the expression evaluation or null if errors were 
encountered.
+ * @return The result of the expression evaluation.
  *
  * @exception ELException Thrown if the expression evaluation failed.
  */ 
Index: jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v
retrieving revision 1.3
diff -u -r1.3 ExpressionEvaluator.java
--- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  3 Oct 2002 
23:01:44 -   1.3
+++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  9 Oct 2002 
+00:07:33 -
@@ -105,8 +105,7 @@
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
  * encountered with no prefix.
- * @return The Expression object encapsulating the arguments, or null 
- * if errors were encountered.
+ * @return The Expression object encapsulating the arguments.
  *
  * @exception ELException Thrown if parsing errors were found.
  */ 
@@ -135,8 +134,7 @@
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
  * encountered with no prefix.
- * @return The result of the expression evaluation or null if errors 
- * were encountered.
+ * @return The result of the expression evaluation.
  *
  * @exception ELException Thrown if the expression evaluation failed.
  */ 
Index: jsr154/src/share/dtd/j2ee_1_4.xsd
===
RCS file: 

[PATCH] jakarta-servletapi-5: Further XSD changes, small javadocupdate

[Mark Roth]

jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java:
 - Removed null as a valid return type for parseExpression() and
evaluate().  These methods must throw an ELException in
 this case.

jsr154/src/share/dtd/j2ee_1_4.xsd:
 - Added jndiEnvironmentRefsGroup

jsr154/src/share/dtd/web-app_2_4.xsd:
 - Added jndiEnvironmentRefsGroup

-- 
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.


Index: jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v
retrieving revision 1.3
diff -u -r1.3 ExpressionEvaluator.java
--- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  3 Oct 2002 
23:01:44 -   1.3
+++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java  7 Oct 2002 
+16:18:56 -
@@ -105,8 +105,7 @@
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
  * encountered with no prefix.
- * @return The Expression object encapsulating the arguments, or null 
- * if errors were encountered.
+ * @return The Expression object encapsulating the arguments.
  *
  * @exception ELException Thrown if parsing errors were found.
  */ 
@@ -135,8 +134,7 @@
  * it is invoked.
  * @param defaultPrefix The default prefix to use when a function is
  * encountered with no prefix.
- * @return The result of the expression evaluation or null if errors 
- * were encountered.
+ * @return The result of the expression evaluation.
  *
  * @exception ELException Thrown if the expression evaluation failed.
  */ 
Index: jsr154/src/share/dtd/j2ee_1_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.3
diff -u -r1.3 j2ee_1_4.xsd
--- jsr154/src/share/dtd/j2ee_1_4.xsd   3 Oct 2002 23:01:44 -   1.3
+++ jsr154/src/share/dtd/j2ee_1_4.xsd   7 Oct 2002 16:19:00 -
@@ -9,7 +9,7 @@
  version=1.4
 xsd:annotation
 xsd:documentation
-@(#)j2ee_1_4.xsds  1.31 02/10/01
+@(#)j2ee_1_4.xsds  1.32 02/10/04
 /xsd:documentation
 /xsd:annotation
 
@@ -136,8 +136,8 @@
 xsd:annotation
 xsd:documentation
 
-This group is used to keep the contained elements in a consistent
-order across J2EE deployment descriptors.
+This group keeps the usage of the contained description related
+elements consistent across J2EE deployment descriptors.
 
 /xsd:documentation
 /xsd:annotation
@@ -733,6 +733,40 @@
 xsd:restriction base=j2ee:string/
 /xsd:simpleContent
 /xsd:complexType
+
+!--  --
+
+xsd:group name=jndiEnvironmentRefsGroup
+xsd:annotation
+xsd:documentation
+
+This group keeps the usage of the contained JNDI environment
+reference elements consistent across J2EE deployment descriptors.
+
+/xsd:documentation
+/xsd:annotation
+xsd:sequence
+xsd:element name=env-entry
+ type=j2ee:env-entryType
+ minOccurs=0 maxOccurs=unbounded/
+xsd:element name=ejb-ref
+ type=j2ee:ejb-refType
+ minOccurs=0 maxOccurs=unbounded/
+xsd:element name=ejb-local-ref
+ type=j2ee:ejb-local-refType
+ minOccurs=0 maxOccurs=unbounded/
+xsd:group ref=j2ee:service-refGroup/
+xsd:element name=resource-ref
+ type=j2ee:resource-refType
+ minOccurs=0 maxOccurs=unbounded/
+xsd:element name=resource-env-ref
+ type=j2ee:resource-env-refType
+ minOccurs=0 maxOccurs=unbounded/
+xsd:element name=message-destination-ref
+ type=j2ee:message-destination-refType
+ minOccurs=0 maxOccurs=unbounded/
+/xsd:sequence
+/xsd:group
 
 !--  --
 
Index: jsr154/src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.5
diff -u -r1.5 web-app_2_4.xsd
--- jsr154/src/share/dtd/web-app_2_4.xsd3 Oct 2002 23:01:44 -   1.5
+++ jsr154/src/share/dtd/web-app_2_4.xsd7 Oct 2002 16:19:04 -
@@ -8,7 +8,7 @@
  version=2.4
 xsd:annotation
 xsd:documentation
-@(#)web-app_2_4.xsds   1.44 02/09/30
+@(#)web-app_2_4.xsds   1.45 02/10/04
 /xsd:documentation
 /xsd:annotation
 
@@ -1122,31 +1122,7 @@
  type=j2ee:security-roleType
  minOccurs=0
  maxOccurs=unbounded/
-xsd:element 

[PATCH] jakarta-servletapi-5: javadocs, API changes and new file

[Mark Roth]

NEW FILE (in jakarta-servletapi-5.newfiles.tar):
 - jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
   (Required by latest j2ee_1_4.xsd)


CHANGED FILES:

jsr152/src/share/javax/servlet/jsp/JspContext.java:
 - getAttribute(name): Remove IllegalArgumentException
   for non-existent scope parameter.
 - Added javadoc for IllegalArgumentException for
   removeAttribute(name, scope)
 - Added javadoc for IllegalArgumentException for
   getAttributeNamesInScope(scope)
 - Added 'public JspWriter pushBody( java.io.Writer writer );'
 - Moved 'public JspWriter popBody()' from PageContext to JspContext.

jsr152/src/share/javax/servlet/jsp/PageContext.java:
 - forward(path): Remove IllegalArgumentException and
   SecurityException, which are not declared in the RequestDispatcher
   counterpart methods.
 - include(path): Remove IllegalArgumentException and
   SecurityException, which are not declared in the RequestDispatcher
   counterpart methods.
 - include(path, flush): Remove IllegalArgumentException and
   SecurityException, which are not declared in the RequestDispatcher
   counterpart methods.
 - Moved 'public JspWriter popBody()' from PageContext to JspContext.

jsr152/src/share/javax/servlet/jsp/el/ELException.java:
 - Removed toString() method, and constructors pass in localized
   message of root cause Throwable.

jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java:
 - resolveVariable( name, context ): Add description for
   context parameter.

jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java:
 - Elaborate on description of what should be passed for the
   expression parameter.  The expression parameter includes
   the tokens '${' and '}', which can appear more than once.
   For example, parseExpression( Version ${major}.${minor}, ... )
   is valid.
 - Elaborate on caller requirements for passing in a FunctionMapper
   to evaluate() and parseExpression().

jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
 - Escape markup in documentation with CDATA instead of lt;

jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
 - Escape markup in documentation with CDATA instead of lt;

jsr154/src/share/dtd/j2ee_1_4.xsd:
 - Escape markup in documentation with CDATA instead of lt;
 - Make CDATA sections use a consistent style
 - Make xsd:include schemaLocation point to IBM site

jsr154/src/share/dtd/web-app_2_4.xsd:
 - Escape markup in documentation with CDATA instead of lt;
 - Added ERROR to list of legal values for request dispatcher


As usual, please let me know if there are any questions or concerns.

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.



Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.3
diff -u -r1.3 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  20 Sep 2002 01:56:44 - 
 1.3
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd  3 Oct 2002 21:59:54 -
@@ -10,7 +10,7 @@
 
 xsd:annotation
 xsd:documentation
-@(#)web-jsptaglibrary_2_0.xsds 1.18 09/19/02
+@(#)web-jsptaglibrary_2_0.xsds 1.19 09/30/02
 /xsd:documentation
 /xsd:annotation
 xsd:annotation
@@ -50,6 +50,7 @@
 
 xsd:annotation
 xsd:documentation
+![CDATA[
 
 This is the XML Schema for the JSP Taglibrary deployment
 descriptor.  All Taglibrary deployment descriptors must
@@ -61,12 +62,12 @@
 and by indicating the version of the schema by
 using the version element as shown below:
 
-lt;taglib xmlns=http://java.sun.com/xml/ns/j2ee;
- xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=...
- version=2.0
-...
-lt;/taglib
+taglib xmlns=http://java.sun.com/xml/ns/j2ee;
+  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation=...
+  version=2.0
+  ...
+/taglib
 
 The instance documents may indicate the published
 version of the schema using xsi:schemaLocation attribute
@@ -74,6 +75,7 @@
 
 http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
 
+]]
 /xsd:documentation
 /xsd:annotation
 
Index: jsr152/src/share/javax/servlet/jsp/JspContext.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java,v
retrieving revision 1.2
diff -u -r1.2 JspContext.java
--- jsr152/src/share/javax/servlet/jsp/JspContext.java  19 Aug 2002 16:29:49 - 
 1.2
+++ jsr152/src/share/javax/servlet/jsp/JspContext.java  3 Oct 2002 21:59:54 -
@@ -78,6 +78,12 @@
  * scripting environment
  * /ul
  *
+ * pBMethods Intended for Container Generated Code/B
+ * p
+ * The following methods enable the Bmanagement of nested/B JspWriter 
+ * 

[PATCH] jakarta-servletapi-5: Additional XSD file patches

[Mark Roth]

Attached is a patch to bring the other Servlet 2.4 XSD files up to date
with the JSP patch I submitted on September 19.

Files modified:
- jsr154/src/share/dtd/j2ee_1_4.xsd
- jsr154/src/share/dtd/web-app_2_4.xsd
- jsr154/src/share/dtd/xml.xsd

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.



Index: jsr154/src/share/dtd/j2ee_1_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 j2ee_1_4.xsd
--- jsr154/src/share/dtd/j2ee_1_4.xsd	13 Aug 2002 16:21:47 -	1.1.1.1
+++ jsr154/src/share/dtd/j2ee_1_4.xsd	24 Sep 2002 17:56:24 -
@@ -9,7 +9,7 @@
  version=1.4
 xsd:annotation
 xsd:documentation
-@(#)j2ee_1_4.xsds	1.20 02/07/12
+@(#)j2ee_1_4.xsds	1.28 02/09/19
 /xsd:documentation
 /xsd:annotation
 
@@ -74,6 +74,8 @@
 xsd:import namespace=http://www.w3.org/XML/1998/namespace;
 schemaLocation=http://www.w3.org/2001/xml.xsd/
 
+xsd:include schemaLocation=j2ee_web_services_client_1_1.xsd/
+
 
 !--  --
 
@@ -123,11 +125,39 @@
type=xsd:anyURI/
 xsd:attribute name=mustUnderstand
type=xsd:boolean/
+xsd:attribute name=id type=xsd:ID/
 
 /xsd:complexType
 
 !--  --
 
+xsd:group name=descriptionGroup
+xsd:annotation
+xsd:documentation
+
+This group is used to keep the contained elements in a consistent
+order across J2EE deployment descriptors.
+
+/xsd:documentation
+/xsd:annotation
+xsd:sequence
+xsd:element name=description
+ type=j2ee:descriptionType
+ minOccurs=0
+ maxOccurs=unbounded/
+xsd:element name=display-name
+ type=j2ee:display-nameType
+ minOccurs=0
+ maxOccurs=unbounded/
+xsd:element name=icon
+ type=j2ee:iconType
+ minOccurs=0
+ maxOccurs=unbounded/
+/xsd:sequence
+/xsd:group
+
+!--  --
+
 xsd:complexType name=descriptionType
 xsd:annotation
 xsd:documentation
@@ -147,13 +177,11 @@
 
 /xsd:documentation
 /xsd:annotation
-
 xsd:simpleContent
-xsd:extension base=xsd:string
-xsd:attribute ref=xml:lang/
+xsd:extension base=j2ee:xsdStringType
+xsd:attribute ref=xml:lang/
 /xsd:extension
 /xsd:simpleContent
-
 /xsd:complexType
 
 !--  --
@@ -187,24 +215,22 @@
 Example:
 
 ...
-   display-name xml:lang=enEmployee Self Service/display-name
+   lt;display-name xml:lang=enEmployee Self Servicelt;/display-name
 
 The value of the xml:lang attribute is en (English) by default.
 
 /xsd:documentation
 /xsd:annotation
-
 xsd:simpleContent
 xsd:extension base=j2ee:string
-xsd:attribute ref=xml:lang/
+xsd:attribute ref=xml:lang/
 /xsd:extension
 /xsd:simpleContent
-
 /xsd:complexType
 
 !--  --
 
-xsd:simpleType name=ejb-linkType
+xsd:complexType name=ejb-linkType
 xsd:annotation
 xsd:documentation
 
@@ -226,16 +252,18 @@
 
 Examples:
 
+![CDATA[
 ejb-linkEmployeeRecord/ejb-link
 
 ejb-link../products/product.jar#ProductEJB/ejb-link
+]]
 
 /xsd:documentation
 /xsd:annotation
-
-xsd:restriction base=j2ee:string/
-
-/xsd:simpleType
+xsd:simpleContent
+xsd:restriction base=j2ee:string/
+/xsd:simpleContent
+/xsd:complexType
 
 !--  --
 
@@ -275,13 +303,17 @@
 xsd:element name=ejb-link
  type=j2ee:ejb-linkType
  minOccurs=0/
+xsd:element name=deployment-extension
+ type=j2ee:deployment-extensionType
+ minOccurs=0
+ maxOccurs=unbounded/
 /xsd:sequence
-
+xsd:attribute name=id type=xsd:ID/
 /xsd:complexType
 
 !--  --
 
-xsd:simpleType name=ejb-ref-nameType
+xsd:complexType name=ejb-ref-nameType
 xsd:annotation
 xsd:documentation
 
@@ -295,18 +327,18 @@
 
 Example:
 
-ejb-ref-nameejb/Payroll/ejb-ref-name
+lt;ejb-ref-nameejb/Payrolllt;/ejb-ref-name
 
 /xsd:documentation
 /xsd:annotation
-
-xsd:restriction base=j2ee:jndi-nameType/
-
-/xsd:simpleType
+xsd:simpleContent
+xsd:restriction base=j2ee:jndi-nameType/
+/xsd:simpleContent
+/xsd:complexType
 
 !--  --
 
-xsd:simpleType name=ejb-ref-typeType
+xsd:complexType name=ejb-ref-typeType
 xsd:annotation
 xsd:documentation
 
@@ -321,13 +353,13 @@
 
 /xsd:documentation
 /xsd:annotation
-
-xsd:restriction base=j2ee:string
-   

[PATCH] jakarta-servletapi-5::Another patch to the JSP XSD files

[Mark Roth]

I just noticed my previous XSD patch from this Monday was never
applied.  Was there a problem?

This patch contains diffs based on the current workspace state, not
based on my previous patch.

This patch contains another few patches to the XSD files.  This affects
both jsp_2_0.xsd and web-jsptaglibrary_2_0.xsd.

Summary of changes:

jsp_2_0.xsd:

- Added id attributes to elements
- Changed (description*, display-name*, icon*) to use 
  common xsd:group reference for consistency.  Definition 
  is in common J2EE file.

web-jsptaglibrary_2_0.xsd:

- Added id attributes to elements
- Changed (description*, display-name*, icon*) to use 
  common xsd:group reference for consistency.  Definition 
  is in common J2EE file.
- Escaped markup under xsd:documentation elements

Files Modified:

- jsr152/src/share/dtd/jsp_2_0.xsd
- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- jsr154/src/share/dtd/jsp_2_0.xsd
- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd

Please let me know if there are any questions or concerns.

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5::Another patch to the JSP XSD files

[Mark Roth]

This time, with the patch.  :)

- Mark

On Thu, 2002-09-19 at 19:36, Mark Roth wrote:
 I just noticed my previous XSD patch from this Monday was never
 applied.  Was there a problem?
 
 This patch contains diffs based on the current workspace state, not
 based on my previous patch.
 
 This patch contains another few patches to the XSD files.  This affects
 both jsp_2_0.xsd and web-jsptaglibrary_2_0.xsd.
 
 Summary of changes:
 
 jsp_2_0.xsd:
 
 - Added id attributes to elements
 - Changed (description*, display-name*, icon*) to use 
   common xsd:group reference for consistency.  Definition 
   is in common J2EE file.
 
 web-jsptaglibrary_2_0.xsd:
 
 - Added id attributes to elements
 - Changed (description*, display-name*, icon*) to use 
   common xsd:group reference for consistency.  Definition 
   is in common J2EE file.
 - Escaped markup under xsd:documentation elements
 
 Files Modified:
 
 - jsr152/src/share/dtd/jsp_2_0.xsd
 - jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
 - jsr154/src/share/dtd/jsp_2_0.xsd
 - jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
 
 Please let me know if there are any questions or concerns.
 
 --
 Mark Roth, Java Software
 JSP 2.0 Co-Specification Lead
 Sun Microsystems, Inc.
 



Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.2
diff -u -r1.2 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd	21 Aug 2002 16:17:48 -	1.2
+++ jsr152/src/share/dtd/jsp_2_0.xsd	19 Sep 2002 23:30:52 -
@@ -8,7 +8,7 @@
  version=2.0
 xsd:annotation
 xsd:documentation
-%W% %G%
+@(#)jsp_2_0.xsds	1.12 09/18/02
 /xsd:documentation
 /xsd:annotation
 
@@ -105,12 +105,12 @@
  minOccurs=0
  maxOccurs=unbounded/
 /xsd:sequence
-
+xsd:attribute name=id type=xsd:ID/
 /xsd:complexType
 
 !--  --
 
-xsd:simpleType name=jsp-fileType
+xsd:complexType name=jsp-fileType
 xsd:annotation
 xsd:documentation
 
@@ -120,9 +120,10 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=j2ee:pathType/
-
-/xsd:simpleType
+xsd:simpleContent
+xsd:restriction base=j2ee:pathType/
+/xsd:simpleContent
+/xsd:complexType
 
 !--  --
 
@@ -145,12 +146,7 @@
 /xsd:annotation
 
 xsd:sequence
-	xsd:element name=description
-		 type=j2ee:descriptionType
-		 minOccurs=0 maxOccurs=unbounded/
-xsd:element name=display-name
-		 type=j2ee:display-nameType
-		 minOccurs=0 maxOccurs=unbounded/
+xsd:group ref=j2ee:descriptionGroup/
 xsd:element name=url-pattern
  type=j2ee:url-patternType
  maxOccurs=unbounded/
@@ -249,7 +245,7 @@
 /xsd:annotation
 /xsd:element
 /xsd:sequence
-
+xsd:attribute name=id type=xsd:ID/
 /xsd:complexType
 
 !--  --
@@ -297,7 +293,7 @@
 /xsd:element
 
 /xsd:sequence
-
+xsd:attribute name=id type=xsd:ID/
 /xsd:complexType
 
 /xsd:schema
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.2
diff -u -r1.2 web-jsptaglibrary_2_0.xsd
--- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd	19 Aug 2002 16:29:49 -	1.2
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd	19 Sep 2002 23:30:52 -
@@ -10,7 +10,7 @@
 
 xsd:annotation
 xsd:documentation
-@(#)web-jsptaglibrary_2_0.xsds	1.14 08/14/02
+@(#)web-jsptaglibrary_2_0.xsds	1.18 09/19/02
 /xsd:documentation
 /xsd:annotation
 xsd:annotation
@@ -61,12 +61,12 @@
 and by indicating the version of the schema by
 using the version element as shown below:
 
-taglib xmlns=http://java.sun.com/xml/ns/j2ee;
+lt;taglib xmlns=http://java.sun.com/xml/ns/j2ee;
  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation=...
  version=2.0
 ...
-/taglib
+lt;/taglib
 
 The instance documents may indicate the published
 version of the schema using xsi:schemaLocation attribute
@@ -137,7 +137,7 @@
 
 !--  --
 
-xsd:simpleType name=body-contentType
+xsd:complexType name=body-contentType
 xsd:annotation
 xsd:documentation
 
@@ -163,17 +163,18 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=j2ee:string
-xsd:enumeration value=tagdependent/
-xsd:enumeration value=TAGDEPENDENT/
-xsd:enumeration value=JSP/
-xsd:enumeration value=empty/
-xsd:enumeration value=EMPTY/
-xsd:enumeration value=scriptless/
-xsd:enumeration value=SCRIPTLESS/
-/xsd:restriction
-
-/xsd:simpleType
+   

[patch] jakarta-servletapi-5: JSP 2.0 Examples missing files

[Mark Roth]

Forgot to tar a subdirectory (thanks to Justy for spotting this!):

This patch adds the following files:
* jsr152/examples/WEB-INF/tags/panel.tag
* jsr152/examples/WEB-INF/tags/helloWorld.tag
* jsr152/examples/WEB-INF/tags/displayProducts.tag

As usual, please let me know if there are any questions or concerns.

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.




jakarta-servletapi-5-jsp2-examples-2.tar
Description: Unix tar archive

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [PATCH] jakarta-servletapi-5: JSP 2.0 Examples

[Mark Roth]

Oops - did cvs diff instead of cvs diff -u.  Here's a better version
of the patch.  Please use this instead.

On Fri, 2002-09-06 at 20:15, Mark Roth wrote:
 Greetings,
 
 Attached is a patch to the jakarta-servletapi-5 workspace with various
 examples that exercise new features in JSP 2.0.  I've also fixed some of
 the JSP 1.2 examples (the paths were not correctly brought over when the
 examples were moved to the jakarta-servletapi-5 workspace).  I've also
 updated some of the XML Schemas in the jsr154/ subdirectory which had
 stale versions of the jsr152 schemas.
 
...

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.



? jsr152/examples/jsp2
? jsr152/examples/WEB-INF/jsp2
? jsr152/examples/WEB-INF/classes/jsp2
? jsr152/examples/images/read.gif
Index: jsr152/examples/index.html
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/examples/index.html,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 index.html
--- jsr152/examples/index.html  27 Aug 2002 13:16:50 -  1.1.1.1
+++ jsr152/examples/index.html  7 Sep 2002 00:17:46 -
@@ -14,7 +14,8 @@
 bfont face=Arial, Helvetica, sans-seriffont size=+2JSP
 Samples/font/font/b
 pThis is a collection of samples demonstrating the usage of different
-parts of the Java Server Pages (JSP) specification.
+parts of the Java Server Pages (JSP) specification.  Both JSP 2.0 and
+JSP 1.2 examples are presented below.
 pThese examples will only work when these pages are being served by a
 servlet engine; of course, we recommend
 a href=http://jakarta.apache.org/tomcat/;Tomcat/a.
@@ -36,6 +37,13 @@
 tdLook at the source code for the example/td
 /tr
 
+!--tr VALIGN=TOP
+td WIDTH=30img SRC=images/read.gif height=24 width=24/td
+
+tdRead more about this feature/td
+--
+
+/tr
 tr VALIGN=TOP
 td WIDTH=30img SRC=images/return.gif height=24 width=24/td
 
@@ -46,6 +54,128 @@
 pTip: For session scoped beans to work, the cookies must be enabled.
 This can be done using browser options.
 brnbsp;
+br
+bufont size=+1JSP 2.0 Examples/font/u/bbr
+
+table BORDER=0 CELLSPACING=5 WIDTH=85% 
+tr valign=TOP
+tdbExpression Language/b/td
+/tr
+
+tr valign=TOP
+tdBasic Arithmetic/td
+td valign=TOP width=30%a href=jsp2/el/basic-arithmetic.jspimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/el/basic-arithmetic.jspExecute/a/td
+
+td width=30%a href=jsp2/el/basic-arithmetic.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/el/basic-arithmetic.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdBasic Comparisons/td
+td valign=TOP width=30%a href=jsp2/el/basic-comparisons.jspimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/el/basic-comparisons.jspExecute/a/td
+
+td width=30%a href=jsp2/el/basic-comparisons.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/el/basic-comparisons.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdImplicit Objects/td
+td valign=TOP width=30%a href=jsp2/el/implicit-objects.jsp?foo=barimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/el/implicit-objects.jsp?foo=barExecute/a/td
+
+td width=30%a href=jsp2/el/implicit-objects.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/el/implicit-objects.htmlSource/a/td
+/tr
+tr valign=TOP
+
+tdFunctions/td
+td valign=TOP width=30%a href=jsp2/el/functions.jsp?foo=JSP+2.0img 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/el/functions.jsp?foo=JSP+2.0Execute/a/td
+
+td width=30%a href=jsp2/el/functions.htmlimg SRC=images/code.gif HSPACE=4 
+BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/el/functions.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdbrbSimpleTag Handlers and JSP Fragments/b/td
+/tr
+
+tr valign=TOP
+tdHello World Tag/td
+td valign=TOP width=30%a href=jsp2/simpletag/hello.jspimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/simpletag/hello.jspExecute/a/td
+
+td width=30%a href=jsp2/simpletag/hello.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/simpletag/hello.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdRepeat Tag/td
+td valign=TOP width=30%a href=jsp2/simpletag/repeat.jspimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/simpletag/repeat.jspExecute/a/td
+
+td width=30%a href=jsp2/simpletag/repeat.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/simpletag/repeat.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdBook Example/td
+td valign=TOP width=30%a href=jsp2/simpletag/book.jspimg 
+src=images/execute.gif hspace=4 border=0  align=top/aa 
+href=jsp2/simpletag/book.jspExecute/a/td
+
+td width=30%a href=jsp2/simpletag/book.htmlimg SRC=images/code.gif 
+HSPACE=4 BORDER=0 height=24 width=24 align=TOP/aa 
+href=jsp2/simpletag/book.htmlSource/a/td
+/tr
+
+tr valign=TOP
+tdbrbTag Files/b/td
+/tr
+
+tr valign=TOP

[patch] jakarta-servletapi-5: Bugfix for 11884

[Mark Roth]

Attached is a bugfix for 11884: getParent in a SimpleTag implementation
returns a Tag.

TagAdapter now works as per the spec.

Files modified:

jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java

--
Mark Roth, Java Software
Co-Specification Lead for JSP 2.0
Sun Microsystems, Inc.




Index: jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java,v
retrieving revision 1.2
diff -u -r1.2 TagAdapter.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java	19 Aug 2002 16:29:51 -	1.2
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagAdapter.java	21 Aug 2002 21:46:59 -
@@ -77,15 +77,22 @@
 {
 /** The simple tag that's being adapted */
 private SimpleTag simpleTagAdaptee;
+
+/** The parent, of this tag, converted (if necessary) to be of type Tag */
+private Tag cachedParent;
 
 /**
- * Creates a new TagAdapter that wraps the given SimeplTag and 
+ * Creates a new TagAdapter that wraps the given SimpleTag and 
  * returns the parent tag when getParent() is called.
  *
  * @param adaptee The SimpleTag being adapted as a Tag.
  */
 public TagAdapter( SimpleTag adaptee ) {
-this.simpleTagAdaptee = simpleTagAdaptee;
+if( adaptee == null ) {
+	// Cannot wrap a null adaptee.
+	throw new IllegalArgumentException();
+}
+this.simpleTagAdaptee = adaptee;
 }
 
 /**
@@ -122,9 +129,18 @@
  * @return The parent of the tag being adapted.
  */
 public Tag getParent() {
-	// Note the parent tag must be an instance of Tag (either a 
-	// direct instance or a wrapped instance).
-	return (Tag)simpleTagAdaptee.getParent();
+	if( this.cachedParent == null ) {
+	JspTag parent = simpleTagAdaptee.getParent();
+	if( parent instanceof Tag ) {
+	this.cachedParent = (Tag)parent;
+	}
+	else {
+// Must be SimpleTag - no other types defined.
+	this.cachedParent = new TagAdapter( (SimpleTag)parent );
+	}
+	}
+
+	return this.cachedParent;
 }
 
 /**



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5: jsp_2_0.xsd

[Mark Roth]

Patch to the XML Schema to accept the new is-xml element.  Eduardo and
I forgot to add it before PFD.

- Mark






Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd	13 Aug 2002 16:20:58 -	1.1.1.1
+++ jsr152/src/share/dtd/jsp_2_0.xsd	21 Aug 2002 03:09:57 -
@@ -8,7 +8,7 @@
  version=2.0
 xsd:annotation
 xsd:documentation
-@(#)jsp_2_0.xsds	1.8 07/29/02
+%W% %G%
 /xsd:documentation
 /xsd:annotation
 
@@ -138,6 +138,7 @@
 - Control enabling of EL evaluation.
 - Control enabling of Scripting elements.
 - Indicate pageEncoding information.
+- Indicating that a resource is a JSP document
 - Prelude and Coda automatic includes.
 
 /xsd:documentation
@@ -159,7 +160,7 @@
 xsd:annotation
 xsd:documentation
 
-Can be used to easily set the isElEnabled
+Can be used to easily set the isELEnabled
 property of a group of JSP pages.  By default, the
 EL evaluation is enabled for Web Applications using
 a Servlet 2.4 or greater web.xml.
@@ -193,6 +194,22 @@
 Can be used to easily set the isScriptingEnabled
 property of a group of JSP pages.  By default,
 scripting is enabled.
+
+/xsd:documentation
+/xsd:annotation
+/xsd:element
+	xsd:element name=is-xml
+		 type=j2ee:true-falseType
+		 minOccurs=0
+xsd:annotation
+xsd:documentation
+
+If true, denotes that the group of resources
+	that match the URL pattern are JSP documents,
+	and thus must be interpreted as XML documents.
+	If false, the resources are assumed to not
+	be JSP documents, unless there is another
+	property group that indicates otherwise.
 
 /xsd:documentation
 /xsd:annotation



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5

[Yutaka Yoshida]

The attached patch contains the latest fix of
servlet 2.4 deployment descriptor, web-app_2_4.xsd.

+ change xsd:string to j2ee:string
+ element locale-encoding-mapping-list moved up before
  the element deployment-extension
  
Thank you,

Yutaka Yoshida
Java/XML Software Group
Sun Microsystems Inc.




? patch.txt
Index: src/share/dtd/web-app_2_4.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.1
diff -u -r1.1 web-app_2_4.xsd
--- src/share/dtd/web-app_2_4.xsd   30 Jul 2002 22:59:45 -  1.1
+++ src/share/dtd/web-app_2_4.xsd   12 Aug 2002 22:58:51 -
@@ -8,7 +8,7 @@
  version=2.4
 xsd:annotation
 xsd:documentation
-@(#)web-app_2_4.xsds   1.32 02/07/26
+@(#)web-app_2_4.xsds   1.34 02/08/01
 /xsd:documentation
 /xsd:annotation
 
@@ -479,7 +479,7 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=xsd:string/
+xsd:restriction base=j2ee:string/
 
 /xsd:simpleType
 
@@ -694,9 +694,9 @@
 
 xsd:sequence
 xsd:element name=locale
-type=xsd:string/
+type=j2ee:string/
 xsd:element name=encoding
-type=xsd:string/
+type=j2ee:string/
 /xsd:sequence
 /xsd:complexType
 
@@ -721,7 +721,7 @@
  type=j2ee:auth-methodType
  minOccurs=0/
 xsd:element name=realm-name
- type=xsd:string minOccurs=0
+ type=j2ee:string minOccurs=0
 xsd:annotation
 xsd:documentation
 
@@ -763,7 +763,7 @@
 /xsd:annotation
 
 xsd:element name=extension
- type=xsd:string/
+ type=j2ee:string/
 xsd:element name=mime-type
  type=j2ee:mime-typeType/
 /xsd:sequence
@@ -786,7 +786,7 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=xsd:string
+xsd:restriction base=j2ee:string
 xsd:pattern value=[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+/
 /xsd:restriction
 
@@ -861,7 +861,7 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=xsd:string/
+xsd:restriction base=j2ee:string/
 
 /xsd:simpleType
 
@@ -981,7 +981,8 @@
 must be expressed in a whole number of minutes.
 If the timeout is 0 or less, the container ensures
 the default behaviour of sessions is never to time
-out.
+out. If this element is not specified, the container
+must set its default timeout period.
 
 /xsd:documentation
 /xsd:annotation
@@ -1068,7 +1069,7 @@
 /xsd:documentation
 /xsd:annotation
 
-xsd:restriction base=xsd:string
+xsd:restriction base=j2ee:string
 xsd:enumeration value=2.4/
 /xsd:restriction
 
@@ -1183,14 +1184,14 @@
  type=j2ee:message-destinationType
  minOccurs=0
  maxOccurs=unbounded/
-xsd:element name=deployment-extension
- type=j2ee:deployment-extensionType
- minOccurs=0
- maxOccurs=unbounded/
 xsd:element name=locale-encoding-mapping-list
  type=j2ee:locale-encoding-mapping-listType
  minOccurs=0
  maxOccurs=1/
+xsd:element name=deployment-extension
+ type=j2ee:deployment-extensionType
+ minOccurs=0
+ maxOccurs=unbounded/
 /xsd:sequence
 
 xsd:attribute name=version
@@ -1218,7 +1219,7 @@
 
 xsd:sequence
 xsd:element name=web-resource-name
- type=xsd:string
+ type=j2ee:string
 xsd:annotation
 xsd:documentation
 
@@ -1258,7 +1259,7 @@
 
 xsd:sequence
 xsd:element name=welcome-file
- type=xsd:string
+ type=j2ee:string
  maxOccurs=unbounded
 xsd:annotation
 xsd:documentation



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] [jakarta-servletapi-5]

[Jean-francois Arcand]

Hi , attached is the remaining XML schema that need to be available locally.

   src/share/dtd/j2ee_1_4.xsd
   src/share/dtd/web-app_2_4.xsd
   src/share/dtd/jsp_2_0.xsd
   src/share/dtd/jsptaglibrary_2_0.xsd

Thanks,

-- Jeanfrancois







jakarta-servletapi- 5_localschema.zip
Description: Zip compressed data

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: [PATCH] [jakarta-servletapi-5]

[Patrick Luby]

Jean-François,

These are already in the jakarta-servletapi-5 workspace and will be 
available in servlet.jar with the patch to 
jakarta-servletapi-5/build.xml that I posted last night.

So, this patch should *not* be applied.

Patrick

Jean-francois Arcand wrote:
 Hi , attached is the remaining XML schema that need to be available locally.
 
   src/share/dtd/j2ee_1_4.xsd
   src/share/dtd/web-app_2_4.xsd
   src/share/dtd/jsp_2_0.xsd
   src/share/dtd/jsptaglibrary_2_0.xsd
 
 Thanks,
 
 -- Jeanfrancois
 
 
 
 
 
 
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

-- 

Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] [jakarta-servletapi-5]

[Jean-francois Arcand]

Hi,

this include a modified version of xml.xsd (from W3c) were the DOCTYPE 
element is removed (commented). Xerces 2.0.1 seems to have problem with 
this entity when schema is used and the parser is running inside a 
firewall, using a local copy of the xml.xsd.

Thanks,

-- Jeanfrancois



Index: xml.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/src/share/dtd/xml.xsd,v
retrieving revision 1.1
diff -u -r1.1 xml.xsd
--- xml.xsd 1 Aug 2002 00:12:24 -   1.1
+++ xml.xsd 1 Aug 2002 17:40:35 -
@@ -1,5 +1,7 @@
 ?xml version='1.0'?
+!-- Xerces 2.0.1 bug when trying to resolve the systemID locally
 !DOCTYPE xs:schema PUBLIC -//W3C//DTD XMLSCHEMA 200102//EN XMLSchema.dtd 
+--
 xs:schema targetNamespace=http://www.w3.org/XML/1998/namespace; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; xml:lang=en
 
  xs:annotation



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5

[Mark Roth]

The attached archive contains three files that should be added to
jakarta-servletapi-5 to enable parsing of DDs and TLDs without needing
to fetch these schemas from their global URL each time.  Contains:

   src/share/dtd/xml.xsd
   src/share/dtd/XMLSchema.dtd
   src/share/dtd/datatypes.dtd

Please let me know if there are any questions or concerns.

-- 
Mark Roth, Java Software
JSP 2.0 Specification co-lead
Sun Microsystems, Inc.



jakarta-servletapi-5-localschemas-patch.tar
Description: Unix tar archive

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH] jakarta-servletapi-5

[Patrick Luby]

Please apply the attached patch. It adds all of the new *.xsd files to 
the servlet.jar.

Also, please cvs remove the following file as it does not appear to be used:

src/share/dtd/web-app_2_3.dtd.backup

Thanks,

Patrick

-- 

Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900



Index: build.xml
===
RCS file: /home/cvspublic/jakarta-servletapi-5/build.xml,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 build.xml
--- build.xml   16 Jul 2002 16:38:40 -  1.1.1.1
+++ build.xml   1 Aug 2002 04:24:42 -
@@ -71,16 +71,21 @@
 
 !-- Servlet resources --
 copy todir=${servletapi.build}/classes/javax/servlet/resources
-fileset dir=src/share/dtd
-  include name=web-app*.dtd/
+fileset dir=src/share/dtd includes=*.dtd,*.xsd
+  exclude name=jsp*.dtd/
+  exclude name=jsp*.xsd/
+  exclude name=web-jsp*.dtd/
+  exclude name=web-jsp*.xsd/
 /fileset
 /copy
 
 !-- JSP resources --
 copy todir=${servletapi.build}/classes/javax/servlet/jsp/resources
 fileset dir=src/share/dtd
-  include name=web-jsptaglibrary*.dtd/
-  include name=jspxml.*/
+  include name=jsp*.dtd/
+  include name=jsp*.xsd/
+  include name=web-jsp*.dtd/
+  include name=web-jsp*.xsd/
 /fileset
 /copy
 



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH][jakarta-servletapi-5]

[Patrick Luby]

Attached is a patch that updates all of the Servlet 2.3 references to 
Servlet 2.4 and JSP 1.2 references to JSP 2.0.

Can someone with commit access to the jakarta-servletapi-5 repository 
please commit this patch?

Thanks,

Patrick

-- 

Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900



? diff.txt
Index: src/share/dtd/web-jsptaglibrary_2_0.dtd
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/src/share/dtd/web-jsptaglibrary_2_0.dtd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 web-jsptaglibrary_2_0.dtd
--- src/share/dtd/web-jsptaglibrary_2_0.dtd 16 Jul 2002 16:38:40 -  1.1.1.1
+++ src/share/dtd/web-jsptaglibrary_2_0.dtd 30 Jul 2002 15:09:11 -
@@ -164,7 +164,7 @@
 
 The listener-class element declares a class in the application that
 must be registered as a web application listener bean.  See the
-Servlet 2.3 specification for details.
+Servlet 2.4 specification for details.
 --
 
 !ELEMENT listener-class (#PCDATA) 
Index: src/share/javax/servlet/jsp/tagext/TagInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TagInfo.java
--- src/share/javax/servlet/jsp/tagext/TagInfo.java 16 Jul 2002 16:38:41 - 
 1.1.1.1
+++ src/share/javax/servlet/jsp/tagext/TagInfo.java 30 Jul 2002 15:09:11 -
@@ -131,7 +131,7 @@
 }
 
 /**
- * Constructor for TagInfo from data in the JSP 1.2 format for TLD.
+ * Constructor for TagInfo from data in the JSP 2.0 format for TLD.
  * This class is to be instantiated only from the TagLibrary code
  * under request from some JSP code that is parsing a
  * TLD (Tag Library Descriptor).
@@ -381,7 +381,7 @@
 }
 
 
-// == JSP 1.2 TLD Information 
+// == JSP 2.0 TLD Information 
 
 
 /**
Index: src/share/javax/servlet/jsp/tagext/TagVariableInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/jsp/tagext/TagVariableInfo.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 TagVariableInfo.java
--- src/share/javax/servlet/jsp/tagext/TagVariableInfo.java 16 Jul 2002 16:38:41 
-  1.1.1.1
+++ src/share/javax/servlet/jsp/tagext/TagVariableInfo.java 30 Jul 2002 15:09:11 
+-
@@ -62,7 +62,7 @@
  *
  * This object should be immutable.
  *
- * This information is only available in JSP 1.2 format
+ * This information is only available in JSP 2.0 format
 */
 
 public class TagVariableInfo {
Index: src/share/javax/servlet/jsp/tagext/VariableInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/jsp/tagext/VariableInfo.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 VariableInfo.java
--- src/share/javax/servlet/jsp/tagext/VariableInfo.java16 Jul 2002 16:38:41 
-  1.1.1.1
+++ src/share/javax/servlet/jsp/tagext/VariableInfo.java30 Jul 2002 15:09:11 
+-
@@ -78,7 +78,7 @@
  * p
  * If a Fully Qualified Class Name is provided, it should refer to a
  * class that should be in the CLASSPATH for the Web Application (see
- * Servlet 2.3 specification - essentially it is WEB-INF/lib and
+ * Servlet 2.4 specification - essentially it is WEB-INF/lib and
  * WEB-INF/classes). Failure to be so will lead to a translation-time
  * error.
  *
@@ -87,7 +87,7 @@
  * the class name must be that of a public class in the context of the
  * import directives of the page where the custom action appears (will
  * check if there is a JLS verbiage to refer to). The class must also
- * be in the CLASSPATH for the Web Application (see Servlet 2.3
+ * be in the CLASSPATH for the Web Application (see Servlet 2.4
  * specification - essentially it is WEB-INF/lib and
  * WEB-INF/classes). Failure to be so will lead to a translation-time
  * error.
@@ -122,7 +122,7 @@
  * IMG src=doc-files/VariableInfo-1.gif/
  *
  *p
- * The JSP 1.2 specification defines the interpretation of 3 values:
+ * The JSP 2.0 specification defines the interpretation of 3 values:
  * 
  * ul
  * li NESTED, if the scripting variable is available between



--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

[PATCH][jakarta-servletapi-5]

[Justyna Horwat]

This patch adds support for Servlet 2.4 servlet request events. These 
are new files so there's no diff.

Untar the patch in your jakarta-servletapi-5 directory. Contents of 
the tar file:

src/share/javax/servlet/ServletRequestListener.java
src/share/javax/servlet/ServletRequestAttributeListener.java
src/share/javax/servlet/ServletRequestAttributeEvent.java
src/share/javax/servlet/ServletRequestEvent.java

Justy



patch.tar
Description: Binary data

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]