kpiroumian 2002/06/23 14:23:49
Modified: src/documentation/xdocs/drafts sitemap-2.1-draft.xsd
Log:
Fixed several incorrections, thanks to Bruno Dumon <[EMAIL PROTECTED]>:
- added missing attributes to map:act, map:redirect-to, map:mount and map:part
- somewhat corrected the pipeline type,
- allowed parameters for map:select
- allowed not URI values for several attributes (e.g. 'ns' in map:part) to allow
substitution params
To do: fix the errors in the schema itself as reported by Xerces:
Revision Changes Path
1.4 +35 -29 xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd
Index: sitemap-2.1-draft.xsd
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap-2.1-draft.xsd 8 Jun 2002 22:55:13 -0000 1.3
+++ sitemap-2.1-draft.xsd 23 Jun 2002 21:23:49 -0000 1.4
@@ -255,29 +255,27 @@
<xs:group ref="map:generatingComponents" minOccurs="0"/>
<xs:group ref="map:transformingComponents" minOccurs="0"
maxOccurs="unbounded"/>
<xs:group ref="map:outputtingComponents" minOccurs="0"/>
- <!--xs:choice minOccurs="0">
- <xs:group ref="map:plainPipeline" />
- <xs:sequence>
- <xs:group ref="map:generatingComponents" />
- <xs:choice>
- <xs:group ref="map:transformingComponents" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="map:outputtingComponents" />
- </xs:choice>
- </xs:sequence>
- </xs:choice -->
</xs:choice>
</xs:group>
<!-- Helper groups -->
<xs:group name="plainPipeline">
- <xs:sequence>
- <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="map:generatingComponents"/>
- <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="map:transformingComponents"/>
- <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="map:outputtingComponents"/>
- </xs:sequence>
+ <xs:choice>
+ <xs:sequence>
+ <xs:choice>
+ <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
+ <xs:group ref="map:generatingComponents"/>
+ </xs:choice>
+ <xs:choice maxOccurs="unbounded">
+ <xs:group ref="map:indirectComponents"/>
+ <xs:group ref="map:transformingComponents"/>
+ </xs:choice>
+ <xs:choice>
+ <xs:group ref="map:indirectComponents" minOccurs="0"
maxOccurs="unbounded"/>
+ <xs:group ref="map:outputtingComponents"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:group ref="map:singletonComponents" />
+ </xs:choice>
</xs:group>
<xs:group name="singletonComponents">
<xs:choice>
@@ -306,7 +304,7 @@
</xs:choice>
</xs:group>
<xs:group name="indirectComponents">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
<xs:element name="match" type="map:matchType"/>
<xs:element name="act" type="map:actType"/>
<xs:element name="select" type="map:selectType"/>
@@ -321,6 +319,8 @@
<xs:element name="parameter" type="map:parameterType"
minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="type" type="xs:string"/>
+ <xs:attribute name="set" type="xs:string"/>
+ <xs:attribute name="src" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -329,14 +329,17 @@
<xs:element name="part" maxOccurs="unbounded">
<xs:complexType name="partType">
<xs:attribute name="element" type="xs:string" use="optional"/>
- <xs:attribute name="ns" type="xs:anyURI" use="optional"/>
- <xs:attribute name="src" type="xs:anyURI" use="required"/>
+ <xs:attribute name="ns" type="xs:string" use="optional"/>
+ <xs:attribute name="prefix" type="xs:string" use="optional"/>
+ <xs:attribute name="src" type="xs:string" use="required"/>
+ <xs:attribute name="strip-root" type="xs:boolean"
use="optional"/>
<xs:attribute name="label" type="xs:string" use="optional"/>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="element" type="xs:string" use="optional"/>
- <xs:attribute name="ns" type="xs:anyURI" use="optional"/>
+ <xs:attribute name="ns" type="xs:string" use="optional"/>
+ <xs:attribute name="prefix" type="xs:string" use="optional"/>
<xs:attribute name="label" type="xs:string" use="optional"/>
</xs:complexType>
<xs:complexType name="callType">
@@ -351,7 +354,7 @@
</xs:sequence>
<xs:attribute name="src" type="xs:string"/>
<xs:attribute name="type" type="xs:NMTOKEN"/>
- <xs:attribute name="label" type="xs:string" use="optional"/>
+ <xs:attribute name="label" type="xs:string" use="optional"/>
</xs:complexType>
<xs:complexType name="handle-errorsType">
<xs:complexContent>
@@ -389,6 +392,7 @@
</xs:attribute>
<xs:attribute name="src" type="xs:string" use="required"/>
<xs:attribute name="uri-prefix" type="xs:string" use="required"/>
+ <xs:attribute name="language" type="xs:string"/>
</xs:complexType>
<xs:complexType name="pipelineType">
<xs:complexContent>
@@ -413,10 +417,12 @@
<xs:attribute name="src" type="xs:string" use="required"/>
</xs:complexType>
<xs:complexType name="redirect-toType">
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
+ <xs:attribute name="uri" type="xs:string" use="required"/>
+ <xs:attribute name="session" type="xs:boolean" />
</xs:complexType>
<xs:complexType name="selectType">
- <xs:sequence>
+ <xs:sequence>
+ <xs:element name="parameter" type="map:parameterType" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="when" maxOccurs="unbounded">
<xs:complexType>
<xs:complexContent>
@@ -426,7 +432,7 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
- <xs:element name="otherwise" minOccurs="0"
type="map:pipelineContentType"/>
+ <xs:element name="otherwise" minOccurs="0"
type="map:pipelineContentType" />
</xs:sequence>
<xs:attribute name="type" type="xs:NMTOKEN"/>
</xs:complexType>
@@ -441,6 +447,6 @@
</xs:sequence>
<xs:attribute name="src" type="xs:string"/>
<xs:attribute name="type" type="xs:NMTOKEN"/>
- <xs:attribute name="label" type="xs:string" use="optional"/>
+ <xs:attribute name="label" type="xs:string" use="optional"/>
</xs:complexType>
</xs:schema>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
