eduardop 01/04/24 17:04:27
Modified: src/share/dtd jspxml.dtd jspxml.xsd
Log:
Again, this time from the correct directory
Revision Changes Path
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jspxml.dtd 2001/04/25 00:00:57 1.2
+++ jspxml.dtd 2001/04/25 00:04:26 1.3
@@ -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.3 +5 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jspxml.xsd 2001/04/25 00:00:57 1.2
+++ jspxml.xsd 2001/04/25 00:04:26 1.3
@@ -14,11 +14,10 @@
<!ENTITY Buffer "[0-9]+kb">
]>
-<!--MISSING jsp:cdata & jsp:attribute -->
<!--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">
@@ -72,6 +71,7 @@
<element ref = "include"/>
<element ref = "forward"/>
<element ref = "plugin"/>
+ <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">
@@ -222,6 +223,8 @@
<element name = "expression" type = "string"/>
+ <element name = "text" type = "string"/>
+
<element name = "useBean">
<annotation>
<documentation>
