Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 49868 invoked from network); 3 Mar 2003 02:26:19 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 3 Mar 2003 02:26:19 -0000 Received: (qmail 15515 invoked by uid 97); 3 Mar 2003 02:28:04 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 15508 invoked from network); 3 Mar 2003 02:28:04 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 3 Mar 2003 02:28:04 -0000 Received: (qmail 49050 invoked by uid 500); 3 Mar 2003 02:26:10 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 49037 invoked from network); 3 Mar 2003 02:26:10 -0000 Received: from kathmandu.sun.com (192.18.98.36) by daedalus.apache.org with SMTP; 3 Mar 2003 02:26:10 -0000 Received: from josie.East.Sun.COM ([129.148.175.4]) by kathmandu.sun.com (8.9.3+Sun/8.9.3) with ESMTP id TAA23128 for ; Sun, 2 Mar 2003 19:26:18 -0700 (MST) Received: from sun.com (vpn-129-152-200-37.East.Sun.COM [129.152.200.37]) by josie.East.Sun.COM (8.11.6+Sun/8.11.6/ENSMAIL,v2.2) with ESMTP id h232QHL09889; Sun, 2 Mar 2003 21:26:17 -0500 (EST) Message-ID: <3E62BED8.1000303@sun.com> Date: Sun, 02 Mar 2003 21:32:56 -0500 From: Mark Roth User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3b) Gecko/20030210 X-Accept-Language: en-us, en MIME-Version: 1.0 To: tomcat-dev@jakarta.apache.org Subject: [PATCH] jakarta-servletapi-5: Latest JSP 2.0 updates Content-Type: multipart/mixed; boundary="------------040706020900020201020302" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --------------040706020900020201020302 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit /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. --------------040706020900020201020302 Content-Type: text/plain; name="jakarta-servletapi-5.patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="jakarta-servletapi-5.patch.txt" 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 -0000 1.9 +++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd 3 Mar 2003 02:24:02 -0000 @@ -10,7 +10,7 @@ - @(#)web-jsptaglibrary_2_0.xsds 1.31 02/11/03 + @(#)web-jsptaglibrary_2_0.xsds 1.32 03/02/03 @@ -99,25 +99,13 @@ - 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. - - - - - - - - - The taglib element contains tag-file elements. - The name subelements of these elements must each be unique. - - - - + @@ -150,7 +138,7 @@ tagdependent The 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 @@ - - - @@ -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 + @@ -308,6 +297,19 @@ + + + + + Function extensions are for tool use only and must not affect + the behavior of a container. + + + + @@ -344,41 +346,6 @@ - - - - - The tag-extensionType is used to indicate - extensions to the specific TLD element. - - It is used by elements to designate an extension block - that is targeted to a specific extension designated by - a set of extension elements that are declared by a - namespace. The namespace identifies the extension to - the tool that processes the extension. - - The type of the extension-element is abstract. Therefore, - a concrete type must be specified by the TLD using - xsi:type attribute for each extension-element. - - - - - - - - - - - - - - - @@ -436,18 +403,14 @@ 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". + the behavior of a container. @@ -572,18 +535,14 @@ 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". + the behavior of a container. @@ -702,18 +661,14 @@ minOccurs="0" maxOccurs="unbounded"/> Taglib 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". + the behavior of a container. @@ -856,6 +811,41 @@ + + + + + + + + + The tld-extensionType is used to indicate + extensions to a specific TLD element. + + It is used by elements to designate an extension block + that is targeted to a specific extension designated by + a set of extension elements that are declared by a + namespace. The namespace identifies the extension to + the tool that processes the extension. + + The type of the extension-element is abstract. Therefore, + a concrete type must be specified by the TLD using + xsi:type attribute for each extension-element. + + + + + + + + + + + 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.8 diff -u -r1.8 JspContext.java --- jsr152/src/share/javax/servlet/jsp/JspContext.java 14 Feb 2003 19:34:43 -0000 1.8 +++ jsr152/src/share/javax/servlet/jsp/JspContext.java 3 Mar 2003 02:24:03 -0000 @@ -190,6 +190,7 @@ * * @param name the name of the attribute to search for * @return the value associated or null + * @throws NullPointerException if the name is null */ abstract public Object findAttribute(String name); @@ -199,6 +200,7 @@ * from all scopes. Does nothing if there is no such object. * * @param name The name of the object to remove. + * @throws NullPointerException if the name is null */ abstract public void removeAttribute(String name); @@ -214,6 +216,7 @@ * PageContext.SESSION_SCOPE but the page that was requested * does not participate in a session or the session has been * invalidated. + * @throws NullPointerException if the name is null */ abstract public void removeAttribute(String name, int scope); @@ -223,6 +226,7 @@ * * @param name the name of the attribute to return the scope for * @return the scope of the object associated with the name specified or 0 + * @throws NullPointerException if the name is null */ abstract public int getAttributesScope(String name); 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.7 diff -u -r1.7 ExpressionEvaluator.java --- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 28 Jan 2003 00:19:10 -0000 1.7 +++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 3 Mar 2003 02:24:05 -0000 @@ -105,6 +105,9 @@ * it is invoked. * @param defaultPrefix The default prefix to use when a function is * encountered with no prefix, or "" if the default is no prefix. + * If the value null is provided, an ELException will be thrown if + * a function call is encountered with no prefix. This is useful + * for situations where a function must have a prefix. * @return The Expression object encapsulating the arguments. * * @exception ELException Thrown if parsing errors were found. @@ -134,6 +137,9 @@ * it is invoked. * @param defaultPrefix The default prefix to use when a function is * encountered with no prefix, or "" if the default is no prefix. + * If the value null is provided, an ELException will be thrown if + * a function call is encountered with no prefix. This is useful + * for situations where a function must have a prefix. * @return The result of the expression evaluation. * * @exception ELException Thrown if the expression evaluation failed. 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.9 diff -u -r1.9 web-jsptaglibrary_2_0.xsd --- jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd 14 Feb 2003 19:34:44 -0000 1.9 +++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd 3 Mar 2003 02:24:07 -0000 @@ -10,7 +10,7 @@ - @(#)web-jsptaglibrary_2_0.xsds 1.31 02/11/03 + @(#)web-jsptaglibrary_2_0.xsds 1.32 03/02/03 @@ -99,25 +99,13 @@ - 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. - - - - - - - - - The taglib element contains tag-file elements. - The name subelements of these elements must each be unique. - - - - + @@ -150,7 +138,7 @@ tagdependent The 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 @@ - - - @@ -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 + @@ -308,6 +297,19 @@ + + + + + Function extensions are for tool use only and must not affect + the behavior of a container. + + + + @@ -344,41 +346,6 @@ - - - - - The tag-extensionType is used to indicate - extensions to the specific TLD element. - - It is used by elements to designate an extension block - that is targeted to a specific extension designated by - a set of extension elements that are declared by a - namespace. The namespace identifies the extension to - the tool that processes the extension. - - The type of the extension-element is abstract. Therefore, - a concrete type must be specified by the TLD using - xsi:type attribute for each extension-element. - - - - - - - - - - - - - - - @@ -436,18 +403,14 @@ 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". + the behavior of a container. @@ -572,18 +535,14 @@ 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". + the behavior of a container. @@ -702,18 +661,14 @@ minOccurs="0" maxOccurs="unbounded"/> Taglib 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". + the behavior of a container. @@ -856,6 +811,41 @@ + + + + + + + + + The tld-extensionType is used to indicate + extensions to a specific TLD element. + + It is used by elements to designate an extension block + that is targeted to a specific extension designated by + a set of extension elements that are declared by a + namespace. The namespace identifies the extension to + the tool that processes the extension. + + The type of the extension-element is abstract. Therefore, + a concrete type must be specified by the TLD using + xsi:type attribute for each extension-element. + + + + + + + + + + + --------------040706020900020201020302 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org --------------040706020900020201020302--