eduardop 01/04/24 17:00:58 Modified: src/share/dtd jspxml.dtd jspxml.xsd Log: Added changes from JSP 1.2 PFD2 Revision Changes Path 1.2 +5 -19 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jspxml.dtd 2001/01/09 03:24:24 1.1 +++ jspxml.dtd 2001/04/25 00:00:57 1.2 @@ -3,16 +3,6 @@ --> <!-- - Documents that are intended to be DTD-valid should begin their - DOCTYPE declaration as follows: - - <!DOCTYPE jsp:root PUBLIC - "http://java.sun.com/dtd/jsp_1_2"; - "http://java.sun.com/dtd/jsp_1_2.dtd"; - - Documents that are intended to be schema-valid may omit the PUBLIC - identifiers. - This DTD is not conditional on any parameter entities in the internal subset and does not export any general entities. --> @@ -60,7 +50,7 @@ <!--=================== Element Groups ====================================--> -<!ENTITY % Directives "jsp:directive.page|jsp:directive.include|jsp:directive.taglib"> +<!ENTITY % Directives "jsp:directive.page|jsp:directive.include"> <!ENTITY % Scripts "jsp:scriptlet|jsp:declaration|jsp:expression"> @@ -100,17 +90,15 @@ isErrorPage %Bool; "false" > +<!-- the jsp:directive.include only appears in JSP documents and does + not appear in the XML views of JSP pages. +--> + <!ELEMENT jsp:directive.include EMPTY> <!ATTLIST jsp:directive.include file %URI; #REQUIRED > -<!ELEMENT jsp:directive.taglib EMPTY> -<!ATTLIST jsp:directive.taglib - uri %URI; #REQUIRED - tagPrefix %Prefix; #REQUIRED -> - <!ELEMENT jsp:scriptlet (#PCDATA)> <!ELEMENT jsp:declaration (#PCDATA)> @@ -180,5 +168,3 @@ > <!ELEMENT jsp:cdata #PCDATA> - -<!-- jsp:attribute is missing - EPLL --> \ No newline at end of file 1.2 +1 -27 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jspxml.xsd 2001/01/09 03:24:24 1.1 +++ jspxml.xsd 2001/04/25 00:00:57 1.2 @@ -63,7 +63,6 @@ <choice> <element ref = "directive.page"/> <element ref = "directive.include"/> - <element ref = "directive.taglib"/> <element ref = "scriptlet"/> <element ref = "declaration"/> <element ref = "expression"/> @@ -209,36 +208,11 @@ <annotation> <documentation> directive.include is the "include directive". + This element does not appear on XML views of JSP pages. </documentation> </annotation> <complexType content = "empty"> <attribute name = "file" use = "required" type = "RelativeURL"/> - </complexType> - </element> - - <element name = "directive.taglib"> - <annotation> - <documentation> - directive.taglib is the "taglib directive". - - In a tag library tag, xmlns must be specified as: - - <tagPrefix:tagname xmlns:tagPrefix="uri" ...> - - where tagPrefix and uri are as specified in a taglib directive. - This allows both Schema-validating parsers and parsers that are not - namespace-aware to operate properly. - - Note: The xmlns attribute must be omitted in a .jsp-format - JSP file. The .jsp-to-XML translator will supply it. - - Constraint: A given tagPrefix must be used with the same uri - throughout the document. - </documentation> - </annotation> - <complexType content = "empty"> - <attribute name = "uri" use = "required" type = "uriReference"/> - <attribute name = "tagPrefix" use = "required" type = "NCName"/> </complexType> </element>
