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 -0000
1.12
+++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd 18 Aug 2003 14:25:09 -0000
@@ -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 -0000 1.8
+++ jsr154/src/share/dtd/j2ee_1_4.xsd 18 Aug 2003 14:25:09 -0000
@@ -8,7 +8,7 @@
version="1.4">
<xsd:annotation>
<xsd:documentation>
- %W% %E%
+ @(#)j2ee_1_4.xsds 1.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 -0000
1.12
+++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd 18 Aug 2003 14:25:09 -0000
@@ -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]
