crossley 2002/11/28 23:06:18
Modified: src/webapp/WEB-INF/entities sitemap-v06.rng
Log:
map:select should be able to have map:parameter children.
map:action component declaration should allow any child elements as additional
configuration information. The exact contents depends on the implementation of
each action, and since users can implement their own actions this content
cannot be foreseen.
Submitted by: Bruno Dumon <[EMAIL PROTECTED]>
Revision Changes Path
1.2 +15 -148 xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng
Index: sitemap-v06.rng
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap-v06.rng 28 Nov 2002 06:30:13 -0000 1.1
+++ sitemap-v06.rng 29 Nov 2002 07:06:18 -0000 1.2
@@ -34,6 +34,7 @@
Jeffrey Ricker NG (Usonia Holdings) <[EMAIL PROTECTED]>
David Crossley <[EMAIL PROTECTED]>
Colin Paul Adams <[EMAIL PROTECTED]>
+ Bruno Dumon <[EMAIL PROTECTED]>
FIXME:
- map:act is used in various contexts, so it has a loose definition
@@ -41,6 +42,9 @@
point-of-view (do not rely on this temporary initial grammar)
- align elements and attributes with sitemap*.xsl
- review all xdocs/userdocs/generators/*.xml etc. and sync with this grammar
+- Add similar changes to those of 2002-11-29 for other component declarations
+ See Bruno email
+ http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=103847911212458
CHANGE HISTORY:
20010715 V0.1 Initial version of DTD. (RNG)
@@ -62,6 +66,11 @@
20021030 V0.5 Additional checks on element contents. (CPA)
20021106 V0.5 Map:selector declared to have any content. (CPA)
20021114 V0.6 Initial set of Schematron rules added. (CPA)
+20021129 V0.6 map:select should be able to have map:parameter children. (BD)
+20021129 V0.6 map:action component declaration should allow any child elements
+ as additional configuration information. The exact contents
+ depends on the implementation of each action, and since users can
+ implement their own actions this content cannot be foreseen. (BD)
====================================================================
-->
@@ -895,19 +904,9 @@
<define name="map.action">
<element name="map:action">
<ref name="map.action.attlist"/>
- <interleave>
- <optional><ref name="create-session"/></optional>
- <optional><ref name="store-in-session"/></optional>
- <optional><ref name="store-in-request"/></optional>
- <optional><ref name="store-in-cookie"/></optional>
- <optional><ref name="locale-attribute"/></optional>
- <optional><ref name="language-attribute"/></optional>
- <optional><ref name="country-attribute"/></optional>
- <optional><ref name="variant-attribute"/></optional>
- <optional><ref name="descriptor"/></optional>
- <optional><ref name="throw-exception"/></optional>
- <optional><ref name="output"/></optional>
- </interleave>
+ <zeroOrMore>
+ <ref name="anyElement"/>
+ </zeroOrMore>
</element>
</define>
<define name="map.action.attlist" combine="interleave">
@@ -917,141 +916,6 @@
<ref name="component.attr"/>
</define>
- <define name="create-session">
- <element name="create-session">
- <ref name="create-session.attlist"/>
- <choice>
- <value>yes</value>
- <value>no</value>
- <value>true</value>
- <value>false</value>
- </choice>
- </element>
- </define>
- <define name="create-session.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="store-in-session">
- <element name="store-in-session">
- <ref name="store-in-session.attlist"/>
- <choice>
- <value>yes</value>
- <value>no</value>
- <value>true</value>
- <value>false</value>
- </choice>
- </element>
- </define>
- <define name="store-in-session.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="store-in-request">
- <element name="store-in-request">
- <ref name="store-in-request.attlist"/>
- <choice>
- <value>yes</value>
- <value>no</value>
- <value>true</value>
- <value>false</value>
- </choice>
- </element>
- </define>
- <define name="store-in-request.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="store-in-cookie">
- <element name="store-in-cookie">
- <ref name="store-in-cookie.attlist"/>
- <choice>
- <value>yes</value>
- <value>no</value>
- <value>true</value>
- <value>false</value>
- </choice>
- </element>
- </define>
- <define name="store-in-cookie.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="locale-attribute">
- <element name="locale-attribute">
- <ref name="locale-attribute.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="locale-attribute.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="language-attribute">
- <element name="language-attribute">
- <ref name="language-attribute.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="language-attribute.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="country-attribute">
- <element name="country-attribute">
- <ref name="country-attribute.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="country-attribute.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="variant-attribute">
- <element name="variant-attribute">
- <ref name="variant-attribute.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="variant-attribute.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="descriptor">
- <element name="descriptor">
- <ref name="descriptor.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="descriptor.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="throw-exception">
- <element name="throw-exception" a:defaultValue="false">
- <ref name="throw-exception.attlist"/>
- <choice>
- <value>yes</value>
- <value>no</value>
- <value>true</value>
- <value>false</value>
- </choice>
- </element>
- </define>
- <define name="throw-exception.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
- <define name="output">
- <element name="output-module">
- <ref name="output.attlist"/>
- <data type="string" />
- </element>
- </define>
- <define name="output.attlist" combine="interleave">
- <ref name="universal.attr"/>
- </define>
-
<!-- =============================================================== -->
<!-- Views -->
<!-- =============================================================== -->
@@ -1285,6 +1149,9 @@
<define name="map.select">
<element name="map:select">
<ref name="map.select.attlist"/>
+ <zeroOrMore>
+ <ref name="map.parameter"/>
+ </zeroOrMore>
<zeroOrMore>
<ref name="map.when"/>
</zeroOrMore>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
