You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2003/04/14 19:36:40 UTC
cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_1_4.xsd jsp_2_0.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
kinman 2003/04/14 10:36:40
Modified: jsr152/src/share/dtd jsp_2_0.xsd web-jsptaglibrary_2_0.xsd
jsr152/src/share/javax/servlet/jsp/tagext
TagLibraryValidator.java ValidationMessage.java
jsr154/src/share/dtd j2ee_1_4.xsd jsp_2_0.xsd
web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
Log:
- Patch by Mark Roth:
This brings the jakarta-servletapi-5 workspace in
sync with the upcoming JSP 2.0 PFD3 release of the specification. It
also has updated schema files for JSP and Servlet.
jsr152/src/share/dtd/jsp_2_0.xsd:
jsr154/src/share/dtd/jsp_2_0.xsd:
- Clarified comments: taglibType documentation and clarified
XML prolog --> XML prolog or text declaration
web-jsptaglibrary_2_0.xsds
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Clarified comments: Replaced reference to Servlet 2.3 spec
with simply "Servlet spec"
jsr154/src/share/dtd/web-app_2_4.xsd:
- Fix session-timeout type(xsdNonNegativeIntegerType -> xsdIntegerType)
- fix encodingType
jsr154/src/share/dtd/j2ee_1_4.xsd:
- change url-patternType from j2ee:string to xsd:string
- role-nameType must allow "*", which means it can't be an NMTOKEN
jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- Clarified behavior when namespaces are redefined.
- Clarified the prefix of id may not always be jsp:
jsr152/src/share/javax/servlet/jsp/tagext/ValidationMessage.java
- Clarified the prefix of id may not always be jsp:
Revision Changes Path
1.8 +11 -8 jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd
Index: jsp_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jsp_2_0.xsd 14 Feb 2003 19:34:43 -0000 1.7
+++ jsp_2_0.xsd 14 Apr 2003 17:36:38 -0000 1.8
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)jsp_2_0.xsds 1.16 02/11/03
+ @(#)jsp_2_0.xsds 1.17 03/18/03
</xsd:documentation>
</xsd:annotation>
@@ -177,10 +177,11 @@
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.
+ error to name different encodings in the prolog
+ or text declaration 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>
@@ -258,9 +259,11 @@
<xsd:annotation>
<xsd:documentation>
- A taglib can be used to provide information on a tag
- library that is used by a JSP page within the Web
- Application.
+ The taglibType defines the syntax for declaring in
+ the deployment descriptor that a tag library is
+ available to the application. This can be done
+ to override implicit map entries from TLD files and
+ from the container.
</xsd:documentation>
</xsd:annotation>
1.11 +2 -2 jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
Index: web-jsptaglibrary_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- web-jsptaglibrary_2_0.xsd 4 Mar 2003 00:17:04 -0000 1.10
+++ web-jsptaglibrary_2_0.xsd 14 Apr 2003 17:36:38 -0000 1.11
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
- @(#)web-jsptaglibrary_2_0.xsds 1.32 03/02/03
+ @(#)web-jsptaglibrary_2_0.xsds 1.33 03/18/03
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -334,7 +334,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
+ application listener bean. See the Servlet
specification for details.
</xsd:documentation>
1.6 +21 -4 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
Index: TagLibraryValidator.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TagLibraryValidator.java 29 Jan 2003 21:42:13 -0000 1.5
+++ TagLibraryValidator.java 14 Apr 2003 17:36:39 -0000 1.6
@@ -76,7 +76,15 @@
*
* 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.
+ * and uri arguments used in the taglib directive. 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.
+ * Therefore, to provide high quality error messages in cases where the
+ * tag elements themselves are checked, the prefix parameter should be
+ * ignored and the actual prefix of the element should be used instead.
+ * TagLibraryValidators should always use the uri to identify elements
+ * as beloning to the tag library, not the prefix.
*
* <p>
* A TagLibraryValidator instance
@@ -101,6 +109,13 @@
* objects. The container then, in turn, can use these
* values to provide more precise information on the location
* of an error.
+ *
+ * <p>
+ * The actual prefix of the <code>id</code> attribute may or may not be
+ * <code>jsp</code> but it will always map to the namespace
+ * <code>http://java.sun.com/JSP/Page</code>. A TagLibraryValidator
+ * implementation must rely on the uri, not the prefix, of the <code>id</code>
+ * attribute.
*/
abstract public class TagLibraryValidator {
@@ -135,12 +150,14 @@
/**
* Validate a JSP page.
- * This will get invoked once per directive in the JSP page.
- * This method will return null if the page is valid; otherwise
+ * This will get invoked once per unique tag library URI in the
+ * XML view. This method will return null if the page is valid; otherwise
* the method should return an array of ValidationMessage objects.
* An array of length zero is also interpreted as no errors.
*
- * @param prefix the value of the prefix argument in the directive
+ * @param prefix the first prefix with which the tag library is
+ * associated, in the XML view. Note that some tags may use
+ * a different prefix if the namespace is redefined.
* @param uri the value of the uri argument in the directive
* @param page the JspData page object
* @return A null object, or zero length array if no errors, an array
1.3 +7 -0 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/ValidationMessage.java
Index: ValidationMessage.java
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/ValidationMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValidationMessage.java 19 Aug 2002 16:29:51 -0000 1.2
+++ ValidationMessage.java 14 Apr 2003 17:36:39 -0000 1.3
@@ -70,6 +70,13 @@
* objects. The container then, in turn, can use these
* values to provide more precise information on the location
* of an error.
+ *
+ * <p>
+ * The actual prefix of the <code>id</code> attribute may or may not be
+ * <code>jsp</code> but it will always map to the namespace
+ * <code>http://java.sun.com/JSP/Page</code>. A TagLibraryValidator
+ * implementation must rely on the uri, not the prefix, of the <code>id</code>
+ * attribute.
*/
public class ValidationMessage {
1.7 +11 -7 jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd
Index: j2ee_1_4.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- j2ee_1_4.xsd 14 Feb 2003 19:34:43 -0000 1.6
+++ j2ee_1_4.xsd 14 Apr 2003 17:36:39 -0000 1.7
@@ -8,7 +8,7 @@
version="1.4">
<xsd:annotation>
<xsd:documentation>
- @(#)j2ee_1_4.xsds 1.37 03/02/11
+ @(#)j2ee_1_4.xsds 1.39 03/04/07
</xsd:documentation>
</xsd:annotation>
@@ -1222,13 +1222,13 @@
The role-nameType designates the name of a security role.
- The name must conform to the lexical rules for an NMTOKEN.
+ The name must conform to the lexical rules for a token.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
- <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+ <xsd:restriction base="j2ee:string"/>
</xsd:simpleContent>
</xsd:complexType>
@@ -1394,14 +1394,18 @@
<xsd:annotation>
<xsd:documentation>
- The url-patternType contains the url pattern of the mapping. It must
- follow the rules specified in Section 11.2 of the Servlet API
- Specification.
+ The url-patternType contains the url pattern of the mapping.
+ It must follow the rules specified in Section 11.2 of the
+ Servlet API Specification. This pattern is assumed to be in
+ URL-decoded form and must not contain CR(#xD) or LF(#xA).
+ If it contains those characters, the container must inform
+ the developer with a descriptive error message.
+ The container must preserve all characters including whitespaces.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
+ <xsd:extension base="xsd:string"/>
</xsd:simpleContent>
</xsd:complexType>
1.8 +11 -8 jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd
Index: jsp_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jsp_2_0.xsd 14 Feb 2003 19:34:44 -0000 1.7
+++ jsp_2_0.xsd 14 Apr 2003 17:36:39 -0000 1.8
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
- @(#)jsp_2_0.xsds 1.16 02/11/03
+ @(#)jsp_2_0.xsds 1.17 03/18/03
</xsd:documentation>
</xsd:annotation>
@@ -177,10 +177,11 @@
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.
+ error to name different encodings in the prolog
+ or text declaration 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>
@@ -258,9 +259,11 @@
<xsd:annotation>
<xsd:documentation>
- A taglib can be used to provide information on a tag
- library that is used by a JSP page within the Web
- Application.
+ The taglibType defines the syntax for declaring in
+ the deployment descriptor that a tag library is
+ available to the application. This can be done
+ to override implicit map entries from TLD files and
+ from the container.
</xsd:documentation>
</xsd:annotation>
1.10 +3 -3 jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd
Index: web-app_2_4.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- web-app_2_4.xsd 5 Mar 2003 19:42:47 -0000 1.9
+++ web-app_2_4.xsd 14 Apr 2003 17:36:40 -0000 1.10
@@ -8,7 +8,7 @@
version="2.4">
<xsd:annotation>
<xsd:documentation>
- @(#)web-app_2_4.xsds 1.55 03/02/19
+ @(#)web-app_2_4.xsds 1.57 03/04/07
</xsd:documentation>
</xsd:annotation>
@@ -379,7 +379,7 @@
</xsd:annotation>
<xsd:restriction base="xsd:string">
- <xsd:pattern value="[~\s]+"/>
+ <xsd:pattern value="[^\s]+"/>
</xsd:restriction>
</xsd:simpleType>
@@ -1011,7 +1011,7 @@
<xsd:sequence>
<xsd:element name="session-timeout"
- type="j2ee:xsdNonNegativeIntegerType"
+ type="j2ee:xsdIntegerType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
1.11 +2 -2 jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
Index: web-jsptaglibrary_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- web-jsptaglibrary_2_0.xsd 4 Mar 2003 00:17:05 -0000 1.10
+++ web-jsptaglibrary_2_0.xsd 14 Apr 2003 17:36:40 -0000 1.11
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
- @(#)web-jsptaglibrary_2_0.xsds 1.32 03/02/03
+ @(#)web-jsptaglibrary_2_0.xsds 1.33 03/18/03
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -334,7 +334,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
+ application listener bean. See the Servlet
specification for details.
</xsd:documentation>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org