cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-cocoon2/webapp/resources/entities sitemap-v02.dtd
Date Thu, 20 Dec 2001 07:22:28 GMT
crossley    01/12/19 23:22:28

  Modified:    webapp/resources/entities sitemap-v02.dtd
  Log:
  Keep DTD copies in sync documentation/xdocs/dtd/ and webapp/resources/entities/
  
  Revision  Changes    Path
  1.3       +93 -81    xml-cocoon2/webapp/resources/entities/sitemap-v02.dtd
  
  Index: sitemap-v02.dtd
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/resources/entities/sitemap-v02.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap-v02.dtd	2001/11/28 05:58:56	1.2
  +++ sitemap-v02.dtd	2001/12/20 07:22:28	1.3
  @@ -53,6 +53,7 @@
     20011106 V0.2 All elements now have "map:" prefix. (DC)
     20011106 V0.2 Incorporated comments Bruno Dumon cocoon-dev 20010718 (DC)
     20011116 V0.2 Changes from label/view discussion cocoon-dev 20011115 (DC)
  +  20011219 V0.2 Deprecated 'redirect-to resource'. Added 'map:call resource'(CH)
   
   ==================================================================== -->
   
  @@ -77,16 +78,16 @@
     <!-- Generators ======================================== -->
   <!ELEMENT map:generators (map:generator*)>
   <!ATTLIST map:generators
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:generator EMPTY>
   <!ATTLIST map:generator
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  -	label CDATA #IMPLIED
  -	pool-max CDATA #IMPLIED
  -	pool-min CDATA #IMPLIED
  -	pool-grow CDATA #IMPLIED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
  +        label CDATA #IMPLIED
  +        pool-max CDATA #IMPLIED
  +        pool-min CDATA #IMPLIED
  +        pool-grow CDATA #IMPLIED
   >
   
   <!-- RNG: with all attributes, which are required and which are implied? -->
  @@ -94,7 +95,7 @@
     <!-- Transformers ====================================== -->
   <!ELEMENT map:transformers (map:transformer*)>
   <!ATTLIST map:transformers
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:transformer ANY>
   <!-- RNG: surely the content is not ANY. However, there were so many
  @@ -106,41 +107,41 @@
   <!ELEMENT catalogue-name (#PCDATA)>
   <!ELEMENT catalogue-location (#PCDATA)>
   <!ATTLIST map:transformer
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  -	label CDATA #IMPLIED
  -	pool-max CDATA #IMPLIED
  -	pool-min CDATA #IMPLIED
  -	pool-grow CDATA #IMPLIED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
  +        label CDATA #IMPLIED
  +        pool-max CDATA #IMPLIED
  +        pool-min CDATA #IMPLIED
  +        pool-grow CDATA #IMPLIED
   >
   
     <!-- Readers =========================================== -->
   <!ELEMENT map:readers (map:reader*)>
   <!ATTLIST map:readers
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:reader EMPTY>
   <!-- RNG: does reader ever have children? Its peers do. -->
   <!ATTLIST map:reader
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
   >
   
     <!-- Serializers ======================================= -->
   <!ELEMENT map:serializers (map:serializer*)>
   <!ATTLIST map:serializers
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:serializer (doctype-public|doctype-system|encoding|
                             omit-xml-declaration|parameter)*>
   <!-- RNG: are these the only children of serializer? -->
   <!ATTLIST map:serializer
  -	name CDATA #REQUIRED
  -	mime-type CDATA #REQUIRED
  -	src CDATA #REQUIRED
  -	pool-max CDATA #IMPLIED
  -	pool-min CDATA #IMPLIED
  -	pool-grow CDATA #IMPLIED
  +        name CDATA #REQUIRED
  +        mime-type CDATA #REQUIRED
  +        src CDATA #REQUIRED
  +        pool-max CDATA #IMPLIED
  +        pool-min CDATA #IMPLIED
  +        pool-grow CDATA #IMPLIED
   >
   <!ELEMENT doctype-public (#PCDATA)>
   <!ELEMENT doctype-system (#PCDATA)>
  @@ -148,36 +149,36 @@
   <!ELEMENT omit-xml-declaration (#PCDATA)>
   <!ELEMENT parameter EMPTY>
   <!ATTLIST parameter
  -	name CDATA #REQUIRED
  -	value CDATA #REQUIRED
  -	type CDATA #IMPLIED
  +        name CDATA #REQUIRED
  +        value CDATA #REQUIRED
  +        type CDATA #IMPLIED
   >
   
     <!-- Selectors ========================================= -->
   <!ELEMENT map:selectors (map:selector*)>
   <!ATTLIST map:selectors
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:selector (browser*)>
   <!ATTLIST map:selector
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
   >
   <!ELEMENT browser EMPTY>
   <!ATTLIST browser
  -	name CDATA #REQUIRED
  -	useragent CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        useragent CDATA #REQUIRED
   >
   
     <!-- Matchers ========================================== -->
   <!ELEMENT map:matchers (map:matcher*)>
   <!ATTLIST map:matchers
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:matcher (attribute-name|parameter-name|header-name)*>
   <!ATTLIST map:matcher
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
   >
   <!ELEMENT attribute-name (#PCDATA)>
   <!ELEMENT parameter-name (#PCDATA)>
  @@ -186,12 +187,12 @@
     <!-- Actions =========================================== -->
   <!ELEMENT map:actions (map:action*)>
   <!ATTLIST map:actions
  -	default CDATA #IMPLIED
  +        default CDATA #IMPLIED
   >
   <!ELEMENT map:action EMPTY>
   <!ATTLIST map:action
  -	name CDATA #REQUIRED
  -	src CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        src CDATA #REQUIRED
   >
   
   <!-- =============================================================== -->
  @@ -201,15 +202,15 @@
   <!ELEMENT map:views (map:view*)>
   <!ELEMENT map:view (map:transform*,map:serialize)>
   <!ATTLIST map:view
  -	name CDATA #REQUIRED
  -	from-label CDATA #IMPLIED
  -	from-position (first|last) "last"
  +        name CDATA #REQUIRED
  +        from-label CDATA #IMPLIED
  +        from-position (first|last) "last"
   >
   <!ELEMENT map:serialize (map:parameter*)>
   <!ATTLIST map:serialize
  -	type CDATA #REQUIRED
  -	mime-type CDATA #IMPLIED
  -	status-code CDATA #IMPLIED
  +        type CDATA #REQUIRED
  +        mime-type CDATA #IMPLIED
  +        status-code CDATA #IMPLIED
   >
   
   <!-- =============================================================== -->
  @@ -219,7 +220,7 @@
   <!ELEMENT map:resources (map:resource*)>
   <!ELEMENT map:resource ((map:generate,map:transform+,map:serialize) | map:act)>
   <!ATTLIST map:resource
  -	name CDATA #REQUIRED
  +        name CDATA #REQUIRED
   >
   <!-- generate and transform defined in PIPELINE section -->
   
  @@ -230,14 +231,14 @@
   <!ELEMENT map:action-sets (map:action-set*)>
   <!ELEMENT map:action-set (map:act+)>
   <!ATTLIST map:action-set
  -	name CDATA #REQUIRED
  +        name CDATA #REQUIRED
   >
  -<!ELEMENT map:act (map:parameter|map:redirect-to|map:generate|
  +<!ELEMENT map:act (map:parameter|map:redirect-to|map:call|map:generate|
                      map:transform|map:serialize|map:act|map:match)*>
   <!ATTLIST map:act
  -	type CDATA #IMPLIED
  -	action CDATA #IMPLIED
  -	set CDATA #IMPLIED
  +        type CDATA #IMPLIED
  +        action CDATA #IMPLIED
  +        set CDATA #IMPLIED
   >
   
   <!-- =============================================================== -->
  @@ -247,7 +248,7 @@
   <!ELEMENT map:pipelines (map:pipeline*)>
   <!ELEMENT map:pipeline (map:match*, map:handle-errors?)>
   
  -<!ELEMENT map:match (map:mount | map:redirect-to | map:generate |
  +<!ELEMENT map:match (map:mount | map:redirect-to | map:call | map:generate |
                        map:transform | map:serialize | map:read |
                        map:aggregate | map:act | map:match)*>
   <!-- RNG: It seemed from the example that match should be defined as
  @@ -256,70 +257,81 @@
   -->
   <!-- DC: Now map:act complicates the content model even further -->
   <!ATTLIST map:match
  -	type CDATA #IMPLIED
  -	pattern CDATA #REQUIRED
  +        type CDATA #IMPLIED
  +        pattern CDATA #REQUIRED
   >
   
   <!-- map:act is already defined in the Action Sets section -->
   
   <!ELEMENT map:mount EMPTY>
   <!ATTLIST map:mount
  -	uri-prefix CDATA #REQUIRED
  -	src CDATA #REQUIRED
  -	reload-method (synchron|asynchron) "asynchron"
  -	check-reload (true|false|yes|no) "no"
  +        uri-prefix CDATA #REQUIRED
  +        src CDATA #REQUIRED
  +        reload-method (synchron|asynchron) "asynchron"
  +        check-reload (true|false|yes|no) "no"
   >
   
   <!ELEMENT map:redirect-to EMPTY>
   <!ATTLIST map:redirect-to
  -	uri CDATA #IMPLIED
  -	resource CDATA #IMPLIED
  -	target CDATA #IMPLIED
  -	session (true|false|yes|no) "no"
  +        uri CDATA #IMPLIED
  +        session (true|false|yes|no) "no"
   >
  +<!-- CH: redirects to resources are now deprecated
  +<!ATTLIST map:redirect-to
  +        uri CDATA #IMPLIED
  +        resource CDATA #IMPLIED
  +        target CDATA #IMPLIED
  +        session (true|false|yes|no) "no"
  +>
  +-->
  +
  +<!ELEMENT map:call (map:parameter*)>
  +<!ATTLIST map:call
  +        resource CDATA #REQUIRED
  +>
   
   <!ELEMENT map:generate (map:parameter*)>
   <!ATTLIST map:generate
  -	type CDATA #IMPLIED
  -	src CDATA #IMPLIED
  -	label CDATA #IMPLIED
  +        type CDATA #IMPLIED
  +        src CDATA #IMPLIED
  +        label CDATA #IMPLIED
   >
   <!ELEMENT map:parameter EMPTY>
   <!ATTLIST map:parameter
  -	name CDATA #REQUIRED
  -	value CDATA #REQUIRED
  +        name CDATA #REQUIRED
  +        value CDATA #REQUIRED
   >
   
   <!ELEMENT map:transform (map:parameter*)>
   <!ATTLIST map:transform
  -	type CDATA #IMPLIED
  -	src CDATA #IMPLIED
  -	label CDATA #IMPLIED
  +        type CDATA #IMPLIED
  +        src CDATA #IMPLIED
  +        label CDATA #IMPLIED
   >
   
   <!-- map:serialize is already defined in VIEWS section -->
   
   <!ELEMENT map:read EMPTY>
   <!ATTLIST map:read
  -	src CDATA #REQUIRED
  -	mime-type CDATA #REQUIRED
  -	type CDATA #IMPLIED
  +        src CDATA #REQUIRED
  +        mime-type CDATA #REQUIRED
  +        type CDATA #IMPLIED
   >
   
   <!ELEMENT map:aggregate (map:part*)>
   <!ATTLIST map:aggregate
  -	element CDATA #IMPLIED
  -	prefix CDATA #IMPLIED
  -	ns CDATA #IMPLIED
  -	label CDATA #IMPLIED
  +        element CDATA #IMPLIED
  +        prefix CDATA #IMPLIED
  +        ns CDATA #IMPLIED
  +        label CDATA #IMPLIED
   >
   <!ELEMENT map:part EMPTY>
   <!ATTLIST map:part
  -	src CDATA #IMPLIED
  -	element CDATA #IMPLIED
  -	ns CDATA #IMPLIED
  -	strip-root CDATA #IMPLIED
  -	label CDATA #IMPLIED
  +        src CDATA #IMPLIED
  +        element CDATA #IMPLIED
  +        ns CDATA #IMPLIED
  +        strip-root CDATA #IMPLIED
  +        label CDATA #IMPLIED
   >
   
   <!ELEMENT map:handle-errors (map:generate*,map:transform*,map:serialize*)>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message