Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
Date: 24 Oct 2002 09:13:44 -0000
Message-ID: <20021024091344.9922.qmail@icarus.apache.org>
From: crossley@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/webapp/WEB-INF/entities sitemap-v04.dtd

crossley    2002/10/24 02:13:44

  Modified:    src/webapp/WEB-INF/entities sitemap-v04.dtd
  Log:
  Fixed some warnings reported by OpenSP.
  Submitted by: Colin Adams <colin@colina.demon.co.uk>
  Added workaround for "transformer-factory" being needed in two places.
  PR: 13916
  
  Revision  Changes    Path
  1.2       +79 -6     xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v04.dtd
  
  Index: sitemap-v04.dtd
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v04.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap-v04.dtd	24 Oct 2002 01:21:10 -0000	1.1
  +++ sitemap-v04.dtd	24 Oct 2002 09:13:44 -0000	1.2
  @@ -25,7 +25,7 @@
     validation issues.
     A proper design process is still, still required.
   * Needed by XML editing tools for creation of reliable documents.
  -* Can generate RNG and WXS, once DTD is locked down.
  +* Can generate RNG or WXS, once the DTD is locked down.
   * We need to synchronise this DTD with the relax-ng work
     by <Bruno.Dumon@the-ecorp.com> ... cocoon-dev 2001-07-18
     http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=99545886226916&w=2
  @@ -138,9 +138,11 @@
      "(map:parameter|map:act|map:match|map:select|map:call|map:redirect-to|map:read|map:aggregate|map:generate|map:transform|map:serialize|map:mount)*">
   
   <!-- CPA: contents confirmed by inspection of TraxTransformer.java -->
  +<!-- DC: workaround: moved "transformer-factory" out on its own, because needed
  +         in both xsltTransformer.contents and traxTransformer.contents -->
   <!ENTITY % traxTransformer.contents
    "use-request-parameters | use-cookies | use-browser-capabilities-db |
  -  use-session-info | transformerFactory | use-deli"
  +  use-session-info | use-deli"
   >
   <!-- CPA: contents confirmed by inspection of I18nTransformer.java -->
   <!ENTITY % i18nTransformer.contents
  @@ -150,8 +152,10 @@
   <!--      N.B. these appear in the source as if they were parameter -->
   <!--      tags, so I'm not sure if this is perfectly correct. Also -->
   <!--      transformer-factory also appears in TraxTransformer -->
  +<!-- DC: workaround: moved "transformer-factory" out on its own, because needed
  +         in both xsltTransformer.contents and traxTransformer.contents -->
   <!ENTITY % xsltTransformer.contents
  - "use-store | transformer-factory | incremental-processing"
  + "use-store | incremental-processing"
   >
   <!-- CPA: contents confirmed by inspection of EncodeURLTransformer.java -->
   <!ENTITY % encodeURLTransformer.contents
  @@ -238,8 +242,8 @@
   <!--      serializer child, but there are no examples so I have -->
   <!--      omitted it for now. mapping comes from castor -->
   <!ELEMENT map:transformer  (%traxTransformer.contents; | %i18nTransformer.contents;
  -                            | %xsltTransformer.contents;
  -                            | %encodeURLTransformer.contents; | mapping )* >
  +                      | %xsltTransformer.contents; | transformer-factory
  +                      | %encodeURLTransformer.contents; | mapping )* >
   <!-- RNG: surely the content is not ANY. However, there were so many
             children here that I did not know where to begin -->
   <!-- DC: here are some that are currently used -->
  @@ -322,6 +326,11 @@
           %src.attr;
           %component.attr;
   >
  +
  +<!ELEMENT cdata-section-elements (#PCDATA)>
  +<!ATTLIST cdata-section-elements
  +        %universal.attr;
  +>
   <!ELEMENT doctype-public (#PCDATA)>
   <!ATTLIST doctype-public
           %universal.attr;
  @@ -480,7 +489,7 @@
           %universal.attr;
   >
   <!ELEMENT throw-exception (#PCDATA)>
  -<!ATTLIST throe-exception
  +<!ATTLIST throw-exception
           %universal.attr;
   >
   <!ELEMENT output (#PCDATA)>
  @@ -877,6 +886,70 @@
           %src.attr;
   >
   
  +<!ELEMENT include-name EMPTY>
  +<!ATTLIST include-name
  +        %universal.attr;
  +>
  +
  +<!ELEMENT exclude-name EMPTY>
  +<!ATTLIST exclude-name
  +        %universal.attr;
  +>
  +
  +<!ELEMENT method EMPTY>
  +<!ATTLIST method
  +        %universal.attr;
  +>
  +
  +<!ELEMENT use-cookies EMPTY>
  +<!ATTLIST use-cookies
  +        %universal.attr;
  +>
  +
  +<!ELEMENT untranslated-text EMPTY>
  +<!ATTLIST untranslated-text
  +        %universal.attr;
  +>
  +
  +<!ELEMENT media-type EMPTY>
  +<!ATTLIST media-type
  +        %universal.attr;
  +>
  +
  +<!ELEMENT version EMPTY>
  +<!ATTLIST version
  +        %universal.attr;
  +>
  +
  +<!ELEMENT transformer-factory EMPTY>
  +<!ATTLIST transformer-factory
  +        %universal.attr;
  +>
  +
  +<!ELEMENT use-session-info EMPTY>
  +<!ATTLIST use-session-info
  +        %universal.attr;
  +>
  +
  +<!ELEMENT incremental-processing EMPTY>
  +<!ATTLIST incremental-processing
  +        %universal.attr;
  +>
  +
  +<!ELEMENT indent EMPTY>
  +<!ATTLIST indent
  +        %universal.attr;
  +>
  +
  +<!ELEMENT set-content-length EMPTY>
  +<!ATTLIST set-content-length
  +        %universal.attr;
  +>
  +
  +<!ELEMENT standalone EMPTY>
  +<!ATTLIST standalone
  +        %universal.attr;
  +>
   
   <!-- =============================================================== -->
   <!-- End of DTD -->
  
  
  

----------------------------------------------------------------------
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