eduardop 01/04/27 09:57:48
Modified: src/share/dtd jspxml.dtd jspxml.xsd
Log:
Changes for Craig.
Revision Changes Path
1.5 +5 -3 jakarta-servletapi-4/src/share/dtd/jspxml.dtd
Index: jspxml.dtd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-4/src/share/dtd/jspxml.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jspxml.dtd 2001/04/25 18:16:54 1.4
+++ jspxml.dtd 2001/04/27 16:57:47 1.5
@@ -63,7 +63,7 @@
|jsp:plugin"
>
-<!ENTITY % Body "(jsp:cdata|%Directives;|%Scripts;|%Actions;)*">
+<!ENTITY % Body "(jsp:text|%Directives;|%Scripts;|%Actions;)*">
<!-- ============================ Elements ============================ -->
@@ -72,7 +72,8 @@
-->
<!ELEMENT jsp:root %Body;>
<!ATTLIST jsp:root
- xmlns:jsp CDATA "http://java.sun.com/dtd/jsp_1_2";
+ xmlns:jsp CDATA "http://java.sun.com/JSP/Page";
+ version CDATA #REQUIRED
>
<!ELEMENT jsp:directive.page EMPTY>
@@ -167,4 +168,5 @@
value CDATA #REQUIRED
>
-<!ELEMENT jsp:cdata #PCDATA>
+<!ELEMENT jsp:text #PCDATA>
+
1.5 +5 -4 jakarta-servletapi-4/src/share/dtd/jspxml.xsd
Index: jspxml.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-4/src/share/dtd/jspxml.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jspxml.xsd 2001/04/25 18:16:55 1.4
+++ jspxml.xsd 2001/04/27 16:57:47 1.5
@@ -17,7 +17,7 @@
<!--Conforms to w3c http://www.w3.org/1999/XMLSchema draft of 7 April 2000-->
<schema xmlns = "http://www.w3.org/1999/XMLSchema";
- xmlns:jsp = "http://java.sun.com/jsp_1_2";
+ xmlns:jsp = "http://java.sun.com/JSP/Page";
targetNamespace = "http://java.sun.com/xschema/jsp_1_2.xsd";
elementFormDefault = "qualified"
attributeFormDefault = "unqualified">
@@ -71,7 +71,7 @@
<element ref = "include"/>
<element ref = "forward"/>
<element ref = "plugin"/>
- <element ref = "cdata"/>
+ <element ref = "text"/>
</choice>
</group>
@@ -174,6 +174,7 @@
on any parameter entities.)
</documentation>
</annotation>
+ <attribute name = "root" use = "required" type = "string"/>
</element>
<element name = "directive.page">
@@ -221,9 +222,9 @@
<element name = "declaration" type = "string"/>
<element name = "expression" type = "string"/>
-
- <element name = "cdata" type = "string"/>
+ <element name = "text" type = "string"/>
+
<element name = "useBean">
<annotation>
<documentation>
