Return-Path: 
 <cocoon-cvs-return-12757-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 42950 invoked by uid 500); 25 Jun 2003 19:47:40 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 42869 invoked by uid 500); 25 Jun 2003 19:47:39 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 42831 invoked from network); 25 Jun 2003 19:47:39 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 25 Jun 2003 19:47:39 -0000
Received: (qmail 33463 invoked by uid 1260); 25 Jun 2003 19:47:38 -0000
Date: 25 Jun 2003 19:47:38 -0000
Message-ID: <20030625194738.33462.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/src/documentation/xdocs/developing/portal
 index.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    2003/06/25 12:47:38

  Modified:    src/targets docs-build.xml validate-build.xml
               src/webapp/WEB-INF/entities catalog
               src/documentation/xdocs/developing/portal index.xml
  Added:       src/webapp/WEB-INF/entities common-charents-v10.mod
                        document-v11.mod document-v11.dtd document-v12.mod
                        document-v12.dtd
  Removed:     src/documentation/xdocs/dtd document-v12.mod
                        specification-v10.dtd book-cocoon-v10.dtd README
                        ISOtech.pen ISOlat1.pen XMLSchema.dtd
                        document-v12.dtd datatypes.dtd faq-v10.dtd
                        document-v11.dtd ISOnum.pen javadoc-v04draft.dtd
                        svg10.dtd ISOpub.pen document-v10.dtd
                        changes-v10.dtd characters.ent ISOgrk1.pen
                        ISOdia.pen todo-v10.dtd common-charents-v10.mod
                        svg-cocoon-v11.dtd document-v11.mod
  Log:
  Removing duplicate DTDs - the solution now is a little bit cleaner, but not the optimum.
  Unfortunately, the xmlcatalog task can't be used as for example Jing does not use it,
  but the xml parser (reader) for jing still wants to look at the dtd.
  
  Revision  Changes    Path
  1.15      +6 -0      cocoon-2.1/src/targets/docs-build.xml
  
  Index: docs-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/docs-build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- docs-build.xml	25 Jun 2003 13:33:24 -0000	1.14
  +++ docs-build.xml	25 Jun 2003 19:47:38 -0000	1.15
  @@ -47,6 +47,12 @@
         <fileset dir="${webapp}/WEB-INF/classes"/>
       </copy>
       <copy todir="${build.context}" filtering="on" file="${webapp}/WEB-INF/logkit.xconf"/>
  +
  +    <!-- copy dtds for validation -->
  +    <mkdir dir="${build.context}/xdocs/dtd"/>
  +    <copy todir="${build.context}/xdocs/dtd" filtering="on">
  +      <fileset dir="${webapp}/WEB-INF/entities"/>
  +    </copy>
     </target>
   
     <!-- Set a variable if the generated docs are already up-to-date. -->
  
  
  
  1.9       +1 -1      cocoon-2.1/src/targets/validate-build.xml
  
  Index: validate-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/validate-build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- validate-build.xml	6 Apr 2003 04:13:22 -0000	1.8
  +++ validate-build.xml	25 Jun 2003 19:47:38 -0000	1.9
  @@ -76,7 +76,7 @@
       <xmlvalidate failonerror="true" lenient="no" warn="yes">
         <!-- FIXME: we can use xmlcatalog with Ant-1.6 -->
         <fileset dir="${build.context}/xdocs" includes="**/*.xml"
  -               excludes="status.xml,drafts/*.xml,dictionary.xml,catalog-test.xml,ctwig/sample/**/*.xml,tabs.xml"/>
  +               excludes="status.xml,drafts/*.xml,dictionary.xml,catalog-test.xml,ctwig/sample/**/*.xml,tabs.xml,dtd/**"/>
       </xmlvalidate>
   
       <echo message="Validating the documentation sitemap.xmap using RELAX NG ..."/>
  
  
  
  1.3       +4 -0      cocoon-2.1/src/webapp/WEB-INF/entities/catalog
  
  Index: catalog
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- catalog	15 May 2003 14:02:26 -0000	1.2
  +++ catalog	25 Jun 2003 19:47:38 -0000	1.3
  @@ -22,6 +22,10 @@
   -- Document Type Definitions --
   PUBLIC "-//APACHE//DTD Documentation V1.0//EN"
          "document-v10.dtd"
  +PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
  +       "document-v11.dtd"
  +PUBLIC "-//APACHE//DTD Documentation V1.2//EN"
  +       "document-v12.dtd"
   PUBLIC "-//APACHE//DTD Changes V1.0//EN"
          "changes-v10.dtd"
   PUBLIC "-//APACHE//DTD FAQ V1.0//EN"
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/common-charents-v10.mod
  
  Index: common-charents-v10.mod
  ===================================================================
  <!-- ===================================================================
  
       Apache Common Character Entity Sets (Version 1.0)
  
  PURPOSE:
    Common elements across all DTDs.
  
  TYPICAL INVOCATION:
  
    <!ENTITY % common-charents PUBLIC
        "-//APACHE//ENTITIES Common Character Entity Sets Vx.y//EN"
        "common-charents-vxy.mod">
    %common-charents;
  
    where
  
      x := major version
      y := minor version
  
  AUTHORS:
    David Crossley <crossley@apache.org>
  
  FIXME:
  
  CHANGE HISTORY:
  [Version 1.0]
    20020613 Initial version. (DC)
  
  COPYRIGHT:
    Copyright (c) 2002 The Apache Software Foundation.
  
    Permission to copy in any form is granted provided this notice is
    included in all copies. Permission to redistribute is granted
    provided this file is distributed untouched in all its parts and
    included files.
  
  ==================================================================== -->
  
  <!-- =============================================================== -->
  <!-- Common ISO character entity sets -->
  <!-- =============================================================== -->
  
  <!ENTITY % ISOlat1 PUBLIC
      "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
      "ISOlat1.pen">
  %ISOlat1;
  
  <!ENTITY % ISOpub PUBLIC
      "ISO 8879:1986//ENTITIES Publishing//EN//XML"
      "ISOpub.pen">
  %ISOpub;
  
  <!ENTITY % ISOtech PUBLIC
      "ISO 8879:1986//ENTITIES General Technical//EN//XML"
      "ISOtech.pen">
  %ISOtech;
  
  <!ENTITY % ISOnum PUBLIC
      "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
      "ISOnum.pen">
  %ISOnum;
  
  <!ENTITY % ISOdia PUBLIC
      "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
      "ISOdia.pen">
  %ISOdia;
  
  <!-- =============================================================== -->
  <!-- End of DTD -->
  <!-- =============================================================== -->
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.mod
  
  Index: document-v11.mod
  ===================================================================
  <!-- ===================================================================
  
       Apache Common Documentation elements (Version 1.1)
  
  PURPOSE:
    This DTD was developed to create a simple yet powerful document
    type for software documentation for use with the Apache projects.
    It has now been superceded by v1.2.
  
  TYPICAL INVOCATION:
  
    <!ENTITY % document PUBLIC
        "-//APACHE//ENTITIES Documentation V1.1//EN"
        "document-v11.mod">
    %document;
  
    where
  
      x := major version
      y := minor version
  
  NOTES:
  
  AUTHORS:
    Stefano Mazzocchi <stefano@apache.org>
    Steven Noels <stevenn@apache.org>
  
  FIXME:
  
  CHANGE HISTORY:
  [Version 1.0]
    20020608 Initial version. (SN)
  
  COPYRIGHT:
    Copyright (c) 2002 The Apache Software Foundation.
  
    Permission to copy in any form is granted provided this notice is
    included in all copies. Permission to redistribute is granted
    provided this file is distributed untouched in all its parts and
    included files.
  
  ==================================================================== -->
  <!-- =============================================================== -->
  <!-- Useful entities for increased DTD readability -->
  <!-- =============================================================== -->
  <!ENTITY % text "#PCDATA">
  <!-- Entities referred to later on are defined up front -->
  <!ENTITY % markup "strong|em|code|sub|sup">
  <!ENTITY % special-inline "br|img|icon|acronym">
  <!ENTITY % links "link|jump|fork">
  <!ENTITY % paragraphs "p|source|note|warning|fixme">
  <!ENTITY % tables "table">
  <!ENTITY % lists "ol|ul|dl">
  <!ENTITY % special-blocks "figure|anchor">
  <!-- =============================================================== -->
  <!-- Entities for general XML compliance -->
  <!-- =============================================================== -->
  <!-- Common attributes
          Every element has an ID attribute (sometimes required,
          but usually optional) for links. %common.att;
          is for common attributes where the ID is optional, and
          %common-idreq.att; is for common attributes where the
          ID is required.
  -->
  <!ENTITY % common.att 'id                     ID              #IMPLIED
           xml:lang               NMTOKEN         #IMPLIED'>
  <!ENTITY % common-idreq.att 'id                     ID              #REQUIRED
           xml:lang               NMTOKEN         #IMPLIED'>
  <!-- xml:space attribute ===============================================
          Indicates that the element contains white space
          that the formatter or other application should retain,
          as appropriate to its function.
  ==================================================================== -->
  <!ENTITY % xmlspace.att 'xml:space (default|preserve) #FIXED "preserve"'>
  <!-- def attribute =====================================================
          Points to the element where the relevant definition can be
          found, using the IDREF mechanism.  %def.att; is for optional
          def attributes, and %def-req.att; is for required def
          attributes.
  ==================================================================== -->
  <!ENTITY % def.att 'def                    IDREF           #IMPLIED'>
  <!ENTITY % def-req.att 'def                    IDREF           #REQUIRED'>
  <!-- ref attribute =====================================================
          Points to the element where more information can be found,
          using the IDREF mechanism.  %ref.att; is for optional
          ref attributes, and %ref-req.att; is for required ref
          attributes.
  ================================================================== -->
  <!ENTITY % ref.att 'ref                    IDREF           #IMPLIED'>
  <!ENTITY % ref-req.att 'ref                    IDREF           #REQUIRED'>
  <!-- =============================================================== -->
  <!-- Entities for general usage -->
  <!-- =============================================================== -->
  <!-- Key attribute =====================================================
          Optionally provides a sorting or indexing key, for cases when
          the element content is inappropriate for this purpose.
  ==================================================================== -->
  <!ENTITY % key.att 'key                    CDATA           #IMPLIED'>
  <!-- Title attributes ==================================================
          Indicates that the element requires to have a title attribute.
  ==================================================================== -->
  <!ENTITY % title.att 'title                  CDATA           #REQUIRED'>
  <!-- Name attributes ==================================================
          Indicates that the element requires to have a name attribute.
  ==================================================================== -->
  <!ENTITY % name.att 'name                   CDATA           #REQUIRED'>
  <!-- Email attributes ==================================================
          Indicates that the element requires to have an email attribute.
  ==================================================================== -->
  <!ENTITY % email.att 'email                  CDATA           #REQUIRED'>
  <!-- Link attributes ===================================================
          Indicates that the element requires to have hyperlink attributes.
  ==================================================================== -->
  <!ENTITY % link.att 'href      CDATA                         #IMPLIED
           role      CDATA                         #IMPLIED
           title     CDATA                         #IMPLIED '>
  <!-- =============================================================== -->
  <!-- General definitions -->
  <!-- =============================================================== -->
  <!-- A person is a general unparsed human entity -->
  <!ELEMENT person EMPTY>
  <!ATTLIST person
    %common.att; 
    %name.att; 
    %email.att; 
  >
  <!-- =============================================================== -->
  <!-- Content definitions -->
  <!-- =============================================================== -->
  <!ENTITY % local.inline "">
  <!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
  <!ENTITY % content.mix "%link-content.mix;|%links;">
  <!-- ==================================================== -->
  <!-- Phrase Markup -->
  <!-- ==================================================== -->
  <!-- Strong (typically bold) -->
  <!ELEMENT strong (%text; | code)*>
  <!ATTLIST strong
    %common.att; 
  >
  <!-- Emphasis (typically italic) -->
  <!ELEMENT em (%text; | code)*>
  <!ATTLIST em
    %common.att; 
  >
  <!-- Code (typically monospaced) -->
  <!ELEMENT code (%text;)>
  <!ATTLIST code
    %common.att; 
  >
  <!-- Superscript (typically smaller and higher) -->
  <!ELEMENT sup (%text;)>
  <!ATTLIST sup
    %common.att; 
  >
  <!-- Subscript (typically smaller and lower) -->
  <!ELEMENT sub (%text;)>
  <!ATTLIST sub
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Hypertextual Links -->
  <!-- ==================================================== -->
  <!-- hyperlink (equivalent of <a ...>) -->
  <!ELEMENT link (%link-content.mix;)*>
  <!ATTLIST link
    %common.att; 
    %link.att; 
  >
  <!-- windows-replacing link (equivalent of <a ... target="_top">) -->
  <!ELEMENT jump (%link-content.mix;)*>
  <!ATTLIST jump
    %common.att; 
    %link.att; 
  >
  <!-- window-forking link (equivalent of <a ... target="_blank">) -->
  <!ELEMENT fork (%link-content.mix;)*>
  <!ATTLIST fork
    %common.att; 
    %link.att; 
  >
  
  <!-- ==================================================== -->
  <!-- Specials -->
  <!-- ==================================================== -->
  <!-- Breakline Object (typically forces line break) -->
  <!ELEMENT br EMPTY>
  <!ATTLIST br
    %common.att; 
  >
  <!-- Image Object (typically an inlined image) -->
  <!ELEMENT img EMPTY>
  <!ATTLIST img
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    usemap CDATA #IMPLIED
    ismap (ismap) #IMPLIED
    %common.att; 
  >
  <!-- Image Icon (typically an inlined image placed as graphical item) -->
  <!ELEMENT icon EMPTY>
  <!ATTLIST icon
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    %common.att; 
  >
  <!-- Acronym (in modern browsers, will have rollover text) -->
  <!ELEMENT acronym (%text;)*>
  <!ATTLIST acronym
    title CDATA #REQUIRED
    %common.att; 
  >
  
  <!-- =============================================================== -->
  <!-- Blocks definitions -->
  <!-- =============================================================== -->
  <!ENTITY % local.blocks "">
  <!ENTITY % blocks "%paragraphs;|%tables;|%lists;|%special-blocks; %local.blocks;">
  <!-- ==================================================== -->
  <!-- Paragraphs -->
  <!-- ==================================================== -->
  <!-- Text Paragraph (normally vertically space delimited. Space can be preserved.) -->
  <!ELEMENT p (%content.mix;)*>
  <!ATTLIST p
    %common.att; 
    xml:space (default|preserve) #IMPLIED
  >
  <!-- Source Paragraph (normally space is preserved) -->
  <!ELEMENT source (%content.mix;)*>
  <!ATTLIST source
    %common.att; 
    %xmlspace.att; 
  >
  <!-- Note Paragraph (normally shown encapsulated) -->
  <!ELEMENT note (%content.mix;)*>
  <!ATTLIST note
    %common.att; 
  >
  <!-- Warning Paragraph (normally shown with eye-catching colors) -->
  <!ELEMENT warning (%content.mix;)*>
  <!ATTLIST warning
    %common.att; 
  >
  <!-- Fixme Paragraph (normally not shown) -->
  <!ELEMENT fixme (%content.mix;)*>
  <!ATTLIST fixme
    author CDATA #REQUIRED
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Tables -->
  <!-- ==================================================== -->
  <!-- Attributes that indicate the spanning of the table cell -->
  <!ENTITY % cell.span 'colspan CDATA "1"
           rowspan CDATA "1"'>
  <!-- Table element -->
  <!ELEMENT table (caption?, tr+)>
  <!ATTLIST table
    %common.att; 
  >
  <!-- The table title -->
  <!ELEMENT caption (%content.mix;)*>
  <!ATTLIST caption
    %common.att; 
  >
  <!-- The table row element -->
  <!ELEMENT tr (th | td)+>
  <!ATTLIST tr
    %common.att; 
  >
  <!-- The table row header element -->
  <!ELEMENT th (%content.mix;)*>
  <!ATTLIST th
    %common.att; 
    %cell.span; 
  >
  <!-- The table row description element -->
  <!ELEMENT td (%content.mix;)*>
  <!ATTLIST td
    %common.att; 
    %cell.span; 
  >
  <!-- ==================================================== -->
  <!-- Lists -->
  <!-- ==================================================== -->
  <!-- List item -->
  <!ELEMENT li (%content.mix; | %lists;)*>
  <!ATTLIST li
    %common.att; 
  >
  <!-- Unordered list (typically bulleted) -->
  <!ELEMENT ul (li | %lists;)+>
  <!--    spacing attribute:
              Use "normal" to get normal vertical spacing for items;
              use "compact" to get less spacing.  The default is dependent
              on the stylesheet. -->
  <!ATTLIST ul
    %common.att; 
    spacing (normal | compact) #IMPLIED
  >
  <!-- Ordered list (typically numbered) -->
  <!ELEMENT ol (li | %lists;)+>
  <!--    spacing attribute:
              Use "normal" to get normal vertical spacing for items;
              use "compact" to get less spacing.  The default is dependent
              on the stylesheet. -->
  <!ATTLIST ol
    %common.att; 
    spacing (normal | compact) #IMPLIED
  >
  <!-- Definition list (typically two-column) -->
  <!ELEMENT dl (dt, dd)+>
  <!ATTLIST dl
    %common.att; 
  >
  <!-- Definition term -->
  <!ELEMENT dt (%content.mix;)*>
  <!ATTLIST dt
    %common.att; 
  >
  <!-- Definition description -->
  <!ELEMENT dd (%content.mix;)*>
  <!ATTLIST dd
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Special Blocks -->
  <!-- ==================================================== -->
  <!-- Image Block (typically a separated and centered image) -->
  <!ELEMENT figure EMPTY>
  <!ATTLIST figure
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    usemap CDATA #IMPLIED
    ismap (ismap) #IMPLIED
    %common.att; 
  >
  <!-- anchor point (equivalent of <a name="...">, typically not rendered) -->
  <!ELEMENT anchor EMPTY>
  <!ATTLIST anchor
    %common-idreq.att; 
  >
  <!-- =============================================================== -->
  <!-- Document -->
  <!-- =============================================================== -->
  <!ELEMENT document (header, body, footer?)>
  <!ATTLIST document
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Header -->
  <!-- ==================================================== -->
  <!ENTITY % local.headers "">
  <!ELEMENT header (title, subtitle?, version?, type?, authors?,
                        notice*, abstract? %local.headers;)>
  <!ATTLIST header
    %common.att; 
  >
  <!ELEMENT title (%text; | %markup;)*>
  <!ATTLIST title
    %common.att; 
  >
  <!ELEMENT subtitle (%text; | %markup;)*>
  <!ATTLIST subtitle
    %common.att; 
  >
  <!ELEMENT version (%text;)>
  <!ATTLIST version
    %common.att;
    major CDATA #IMPLIED
    minor CDATA #IMPLIED
    fix CDATA #IMPLIED
    tag CDATA #IMPLIED
  >
  <!ELEMENT type (%text;)>
  <!ATTLIST type
    %common.att; 
  >
  <!ELEMENT authors (person+)>
  <!ATTLIST authors
    %common.att; 
  >
  <!ELEMENT notice (%content.mix;)*>
  <!ATTLIST notice
    %common.att; 
  >
  <!ELEMENT abstract (%content.mix;)*>
  <!ATTLIST abstract
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Body -->
  <!-- ==================================================== -->
  <!ENTITY % local.sections "">
  <!ENTITY % sections "section %local.sections;">
  <!ELEMENT body (%sections; | %blocks;)+>
  <!ATTLIST body
    %common.att; 
  >
  <!ELEMENT section (title, (%sections; | %blocks;)*)>
  <!ATTLIST section
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Footer -->
  <!-- ==================================================== -->
  <!ENTITY % local.footers "">
  <!ELEMENT footer (legal %local.footers;)>
  <!ELEMENT legal (%content.mix;)*>
  <!ATTLIST legal
    %common.att; 
  >
  <!-- =============================================================== -->
  <!-- End of DTD -->
  <!-- =============================================================== -->
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.dtd
  
  Index: document-v11.dtd
  ===================================================================
  <!-- ===================================================================
  
       Apache Documentation DTD (Version 1.1)
  
  PURPOSE:
    This DTD was developed to create a simple yet powerful document
    type for software documentation for use with the Apache projects.
    It is an XML-compliant DTD and it's maintained by the Apache XML
    project. It has now been superceded by v1.2.
  
  TYPICAL INVOCATION:
  
    <!DOCTYPE document PUBLIC
         "-//APACHE//DTD Documentation V1.1//EN"
         "document-v11.dtd">
  
    where
  
      x := major version
      y := minor version
  
  NOTES:
    Many of the design patterns used in this DTD were take from the
    W3C XML Specification DTD edited by Eve Maler <elm@arbortext.com>.
  
    Where possible, great care has been used to reuse HTML tag
    names to reduce learning efforts and to allow HTML editors to be
    used for complex authorings like tables and lists.
  
  EXTENSIBILITY:
    This DTD includes several empty placeholders that can be used to
    extend it. These placeholders are implemented with empty entities. Here
    is the list of those empty entities and what they are used for:
  
      - local.inline: this entity should contain extended definitions of
                      elements that can be used 'inline', or directly inside
                      the content. An example for this entity could be
  
                          <!ENTITY % local.inline "|citation">
  
      - local.blocks: this entity should contain extended definitions of
                      elements that behave as 'blocks', thus can be visually
                      rendered as areas on the canvas. An example for this
                      entity could be:
  
                          <!ENTITY % local.blocks "|poem">
  
      - local.sections: this entity should contain extended definitions of
                        elements that behave as 'sections', thus can be considered
                        containers of block-level elements. An example for
                        this entity could be:
  
                          <!ENTITY % local.sections "|chapter">
  
      - local.headers: this entity should contain extended definitions of
                       elements that behave as parts of the document header.
                       An example for this header could be:
  
                          <!ENTITY % local.headers ", notes?">
  
      - local.footers: this entity should contain extended definitions of
                       elements that behave as parts of the document footer.
                       An example for this header could be:
  
                          <!ENTITY % local.footers ", annotations*">
  
  
  AUTHORS:
    Stefano Mazzocchi <stefano@apache.org>
    Steven Noels <stevenn@outerthought.org>
  
  FIXME:
    - should "form" tags be included?
  
  CHANGE HISTORY:
  [Version 1.0]
    19991121 Initial version. (SM)
    19991123 Replaced "res" with more standard "strong" for emphasis. (SM)
    19991124 Added "fork" element for window forking behavior. (SM)
    19991124 Added "img-inline" element to separate from "img". (SM)
    19991129 Removed "affiliation" from "author". (SM)
    19991129 Made "author" empty and moved "name|email" as attributes. (SM)
    19991215 Simplified table section. (SM)
    19991215 Changed "img-block" in more friendly "figure". (SM)
    20000125 Added the "icon" image. (SM)
    20000126 Allowed "anchor" in all levels. (SM)
    20000404 Removed the "role" attribute from common-xxx.att. (SM)
    20000815 Allowed "code" inside "strong" and "em". (SM)
  [Version 1.1]
    20011212 Used public identifiers for external entities. (SM)
    20011212 Removed xlink attributes since not used. (SM)
    20011212 Removed "connect" since not required at this level. (SM)
    20011218 Added "warning" as a block level object. (SM)
    20011218 Removed explicitly numbered sections ("s1|s2|s3|s4"). (SM)
    20011218 Added "section" element. (SM)
    20011218 Allowed "body" to have blocks without a section. (SM)
    20011218 Removed "sl" since not really different from "ul". (SM)
    20020214 Moved empty placeholder entity declarations up front (SNS)
    20020214 Corrected content model of content.mix parameter entity (SNS)
    20020519 The DTDs are now modular so various parts can be re-used (SNS)
    20020606 Made title into an child element of its parent instead of an attribute (SNS)
    20020613 Move the declarations of ISO character entity sets to module (DC)
  
  COPYRIGHT:
    Copyright (c) 2002-2003 The Apache Software Foundation.
  
    Permission to copy in any form is granted provided this notice is
    included in all copies. Permission to redistribute is granted
    provided this file is distributed untouched in all its parts and
    included files.
  
  ==================================================================== -->
  
  
  <!-- =============================================================== -->
  <!-- Include the Common ISO Character Entity Sets -->
  <!-- =============================================================== -->
  
  <!ENTITY % common-charents PUBLIC
      "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
      "common-charents-v10.mod">
  %common-charents;
  
  <!-- =============================================================== -->
  <!-- Document -->
  <!-- =============================================================== -->
  
  <!ENTITY % document PUBLIC
      "-//APACHE//ENTITIES Documentation V1.1//EN"
      "document-v11.mod">
  %document;
  
  <!-- =============================================================== -->
  <!-- End of DTD -->
  <!-- =============================================================== -->
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.mod
  
  Index: document-v12.mod
  ===================================================================
  <!-- ===================================================================
  
       Apache Common Documentation elements (Version 1.2)
  
  PURPOSE:
    This DTD was developed to create a simple yet powerful document
    type for software documentation for use with the Apache projects.
  
  TYPICAL INVOCATION:
  
    <!ENTITY % document PUBLIC
        "-//APACHE//ENTITIES Documentation Vxy//EN"
        "document-vxy.mod">
    %document;
  
    where
  
      x := major version
      y := minor version
  
  NOTES:
  
  AUTHORS:
    Stefano Mazzocchi <stefano@apache.org>
    Steven Noels <stevenn@apache.org>
  
  FIXME:
  
  CHANGE HISTORY:
  [Version 1.0]
    20020608 Initial version. (SN)
  
  COPYRIGHT:
    Copyright (c) 2002 The Apache Software Foundation.
  
    Permission to copy in any form is granted provided this notice is
    included in all copies. Permission to redistribute is granted
    provided this file is distributed untouched in all its parts and
    included files.
  
  ==================================================================== -->
  <!-- =============================================================== -->
  <!-- Useful entities for increased DTD readability -->
  <!-- =============================================================== -->
  <!ENTITY % text "#PCDATA">
  <!-- Entities referred to later on are defined up front -->
  <!ENTITY % markup "strong|em|code|sub|sup">
  <!ENTITY % special-inline "br|img|icon|acronym">
  <!ENTITY % links "link|jump|fork">
  <!ENTITY % paragraphs "p|source|note|warning|fixme">
  <!ENTITY % tables "table">
  <!ENTITY % lists "ol|ul|dl">
  <!ENTITY % special-blocks "figure|anchor">
  <!-- =============================================================== -->
  <!-- Entities for general XML compliance -->
  <!-- =============================================================== -->
  <!-- Common attributes
          Every element has an ID attribute (sometimes required,
          but usually optional) for links. %common.att;
          is for common attributes where the ID is optional, and
          %common-idreq.att; is for common attributes where the
          ID is required.
  -->
  <!ENTITY % common.att 'id                     ID              #IMPLIED
           xml:lang               NMTOKEN         #IMPLIED'>
  <!ENTITY % common-idreq.att 'id                     ID              #REQUIRED
           xml:lang               NMTOKEN         #IMPLIED'>
  <!-- xml:space attribute ===============================================
          Indicates that the element contains white space
          that the formatter or other application should retain,
          as appropriate to its function.
  ==================================================================== -->
  <!ENTITY % xmlspace.att 'xml:space (default|preserve) #FIXED "preserve"'>
  <!-- def attribute =====================================================
          Points to the element where the relevant definition can be
          found, using the IDREF mechanism.  %def.att; is for optional
          def attributes, and %def-req.att; is for required def
          attributes.
  ==================================================================== -->
  <!ENTITY % def.att 'def                    IDREF           #IMPLIED'>
  <!ENTITY % def-req.att 'def                    IDREF           #REQUIRED'>
  <!-- ref attribute =====================================================
          Points to the element where more information can be found,
          using the IDREF mechanism.  %ref.att; is for optional
          ref attributes, and %ref-req.att; is for required ref
          attributes.
  ================================================================== -->
  <!ENTITY % ref.att 'ref                    IDREF           #IMPLIED'>
  <!ENTITY % ref-req.att 'ref                    IDREF           #REQUIRED'>
  <!-- =============================================================== -->
  <!-- Entities for general usage -->
  <!-- =============================================================== -->
  <!-- Key attribute =====================================================
          Optionally provides a sorting or indexing key, for cases when
          the element content is inappropriate for this purpose.
  ==================================================================== -->
  <!ENTITY % key.att 'key                    CDATA           #IMPLIED'>
  <!-- Title attributes ==================================================
          Indicates that the element requires to have a title attribute.
  ==================================================================== -->
  <!ENTITY % title.att 'title                  CDATA           #REQUIRED'>
  <!-- Name attributes ==================================================
          Indicates that the element requires to have a name attribute.
  ==================================================================== -->
  <!ENTITY % name.att 'name                   CDATA           #REQUIRED'>
  <!-- Email attributes ==================================================
          Indicates that the element requires to have an email attribute.
  ==================================================================== -->
  <!ENTITY % email.att 'email                  CDATA           #REQUIRED'>
  <!-- Link attributes ===================================================
          Indicates that the element requires to have hyperlink attributes.
  ==================================================================== -->
  <!ENTITY % link.att 'href      CDATA             #REQUIRED
           role      CDATA                         #IMPLIED
           title     CDATA                         #IMPLIED '>
  <!-- =============================================================== -->
  <!-- General definitions -->
  <!-- =============================================================== -->
  <!-- A person is a general unparsed human entity -->
  <!ELEMENT person EMPTY>
  <!ATTLIST person
    %common.att; 
    %name.att; 
    %email.att; 
  >
  <!-- =============================================================== -->
  <!-- Content definitions -->
  <!-- =============================================================== -->
  <!ENTITY % local.inline "">
  <!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
  <!ENTITY % content.mix "%link-content.mix;|%links;">
  <!-- ==================================================== -->
  <!-- Phrase Markup -->
  <!-- ==================================================== -->
  <!-- Strong (typically bold) -->
  <!ELEMENT strong (%content.mix;)*>
  <!ATTLIST strong
    %common.att; 
  >
  <!-- Emphasis (typically italic) -->
  <!ELEMENT em (%content.mix;)*>
  <!ATTLIST em
    %common.att; 
  >
  <!-- Code (typically monospaced) -->
  <!ELEMENT code (%text;)>
  <!ATTLIST code
    %common.att; 
  >
  <!-- Superscript (typically smaller and higher) -->
  <!ELEMENT sup (%text;)>
  <!ATTLIST sup
    %common.att; 
  >
  <!-- Subscript (typically smaller and lower) -->
  <!ELEMENT sub (%text;)>
  <!ATTLIST sub
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Hypertextual Links -->
  <!-- ==================================================== -->
  <!-- hyperlink (equivalent of <a ...>) -->
  <!ELEMENT link (%link-content.mix;)*>
  <!ATTLIST link
    %common.att; 
    %link.att; 
  >
  <!-- windows-replacing link (equivalent of <a ... target="_top">) -->
  <!ELEMENT jump (%link-content.mix;)*>
  <!ATTLIST jump
    %common.att; 
    %link.att; 
  >
  <!-- window-forking link (equivalent of <a ... target="_blank">) -->
  <!ELEMENT fork (%link-content.mix;)*>
  <!ATTLIST fork
    %common.att; 
    %link.att; 
  >
  
  <!-- ==================================================== -->
  <!-- Specials -->
  <!-- ==================================================== -->
  <!-- Breakline Object (typically forces line break) -->
  <!ELEMENT br EMPTY>
  <!ATTLIST br
    %common.att; 
  >
  <!-- Image Object (typically an inlined image) -->
  <!ELEMENT img EMPTY>
  <!ATTLIST img
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    usemap CDATA #IMPLIED
    ismap (ismap) #IMPLIED
    %common.att; 
  >
  <!-- Image Icon (typically an inlined image placed as graphical item) -->
  <!ELEMENT icon EMPTY>
  <!ATTLIST icon
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    %common.att; 
  >
  <!-- Acronym (in modern browsers, will have rollover text) -->
  <!ELEMENT acronym (%text;)*>
  <!ATTLIST acronym
    title CDATA #REQUIRED
    %common.att; 
  >
  
  <!-- =============================================================== -->
  <!-- Blocks definitions -->
  <!-- =============================================================== -->
  <!ENTITY % local.blocks "">
  <!ENTITY % blocks "%paragraphs;|%tables;|%lists;|%special-blocks; %local.blocks;">
  
  <!-- Flow mixes block and inline -->
  <!ENTITY % flow "%content.mix;|%blocks;">
  
  <!-- ==================================================== -->
  <!-- Paragraphs -->
  <!-- ==================================================== -->
  <!-- Text Paragraph (normally vertically space delimited. Space can be preserved.) -->
  <!ELEMENT p (%content.mix;)*>
  <!ATTLIST p
    %common.att; 
    xml:space (default|preserve) #IMPLIED
  >
  <!-- Source Paragraph (normally space is preserved) -->
  <!ELEMENT source (%content.mix;)*>
  <!ATTLIST source
    %common.att; 
    %xmlspace.att; 
  >
  <!-- Note Paragraph (normally shown encapsulated) -->
  <!ELEMENT note (%content.mix;)*>
  <!ATTLIST note
    %common.att; 
  >
  <!-- Warning Paragraph (normally shown with eye-catching colors) -->
  <!ELEMENT warning (%content.mix;)*>
  <!ATTLIST warning
    %common.att; 
  >
  <!-- Fixme Paragraph (normally not shown) -->
  <!ELEMENT fixme (%content.mix;)*>
  <!ATTLIST fixme
    author CDATA #REQUIRED
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Tables -->
  <!-- ==================================================== -->
  <!-- Attributes that indicate the spanning of the table cell -->
  <!ENTITY % cell.span 'colspan CDATA "1"
           rowspan CDATA "1"'>
  <!-- Table element -->
  <!ELEMENT table (caption?, tr+)>
  <!ATTLIST table
    %common.att; 
  >
  <!-- The table title -->
  <!ELEMENT caption (%content.mix;)*>
  <!ATTLIST caption
    %common.att; 
  >
  <!-- The table row element -->
  <!ELEMENT tr (th | td)+>
  <!ATTLIST tr
    %common.att; 
  >
  <!-- The table row header element -->
  <!ELEMENT th (%flow;)*>
  <!ATTLIST th
    %common.att; 
    %cell.span; 
  >
  <!-- The table row description element -->
  <!ELEMENT td (%flow;)*>
  <!ATTLIST td
    %common.att; 
    %cell.span; 
  >
  <!-- ==================================================== -->
  <!-- Lists -->
  <!-- ==================================================== -->
  <!-- List item -->
  <!ELEMENT li (%flow;)*>
  <!ATTLIST li
    %common.att; 
  >
  <!-- Unordered list (typically bulleted) -->
  <!ELEMENT ul (li | %lists;)+>
  <!--    spacing attribute:
              Use "normal" to get normal vertical spacing for items;
              use "compact" to get less spacing.  The default is dependent
              on the stylesheet. -->
  <!ATTLIST ul
    %common.att; 
    spacing (normal | compact) #IMPLIED
  >
  <!-- Ordered list (typically numbered) -->
  <!ELEMENT ol (li | %lists;)+>
  <!--    spacing attribute:
              Use "normal" to get normal vertical spacing for items;
              use "compact" to get less spacing.  The default is dependent
              on the stylesheet. -->
  <!ATTLIST ol
    %common.att; 
    spacing (normal | compact) #IMPLIED
  >
  <!-- Definition list (typically two-column) -->
  <!ELEMENT dl (dt, dd)+>
  <!ATTLIST dl
    %common.att; 
  >
  <!-- Definition term -->
  <!ELEMENT dt (%content.mix;)*>
  <!ATTLIST dt
    %common.att; 
  >
  <!-- Definition description -->
  <!ELEMENT dd (%flow; )*>
  <!ATTLIST dd
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Special Blocks -->
  <!-- ==================================================== -->
  <!-- Image Block (typically a separated and centered image) -->
  <!ELEMENT figure EMPTY>
  <!ATTLIST figure
    src CDATA #REQUIRED
    alt CDATA #REQUIRED
    height CDATA #IMPLIED
    width CDATA #IMPLIED
    usemap CDATA #IMPLIED
    ismap (ismap) #IMPLIED
    align CDATA #IMPLIED
    %common.att; 
  >
  <!-- anchor point (equivalent of <a name="...">, typically not rendered) -->
  <!ELEMENT anchor EMPTY>
  <!ATTLIST anchor
    %common-idreq.att; 
  >
  <!-- =============================================================== -->
  <!-- Document -->
  <!-- =============================================================== -->
  <!ELEMENT document (header, body, footer?)>
  <!ATTLIST document
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Header -->
  <!-- ==================================================== -->
  <!ENTITY % local.headers "">
  <!ELEMENT header (title, subtitle?, version?, type?, authors?,
                        notice*, abstract? %local.headers;)>
  <!ATTLIST header
    %common.att; 
  >
  <!ELEMENT title (%text; | %markup; | %links; | %special-inline;)*>
  <!ATTLIST title
    %common.att; 
  >
  <!ELEMENT subtitle (%text; | %markup;)*>
  <!ATTLIST subtitle
    %common.att; 
  >
  <!ELEMENT version (%text;)>
  <!ATTLIST version
    %common.att;
    major CDATA #IMPLIED
    minor CDATA #IMPLIED
    fix CDATA #IMPLIED
    tag CDATA #IMPLIED
  >
  <!ELEMENT type (%text;)>
  <!ATTLIST type
    %common.att; 
  >
  <!ELEMENT authors (person+)>
  <!ATTLIST authors
    %common.att; 
  >
  <!ELEMENT notice (%content.mix;)*>
  <!ATTLIST notice
    %common.att; 
  >
  <!ELEMENT abstract (%content.mix;)*>
  <!ATTLIST abstract
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Body -->
  <!-- ==================================================== -->
  <!ENTITY % local.sections "">
  <!ENTITY % sections "section %local.sections;">
  <!ELEMENT body (%sections; | %blocks;)+>
  <!ATTLIST body
    %common.att; 
  >
  <!ELEMENT section (title, (%sections; | %blocks;)*)>
  <!ATTLIST section
    %common.att; 
  >
  <!-- ==================================================== -->
  <!-- Footer -->
  <!-- ==================================================== -->
  <!ENTITY % local.footers "">
  <!ELEMENT footer (legal %local.footers;)>
  <!ELEMENT legal (%content.mix;)*>
  <!ATTLIST legal
    %common.att; 
  >
  <!-- =============================================================== -->
  <!-- End of DTD -->
  <!-- =============================================================== -->
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.dtd
  
  Index: document-v12.dtd
  ===================================================================
  <!-- ===================================================================
  
       Apache Documentation DTD (Version 1.2)
  
  PURPOSE:
    This DTD was developed to create a simple yet powerful document
    type for software documentation for use with the Apache projects.
    It is an XML-compliant DTD and it's maintained by the Apache XML
    project.
  
  TYPICAL INVOCATION:
  
    <!DOCTYPE document PUBLIC
         "-//APACHE//DTD Documentation Vx.y//EN"
         "document-vxy.dtd">
  
    where
  
      x := major version
      y := minor version
  
  NOTES:
    Many of the design patterns used in this DTD were take from the
    W3C XML Specification DTD edited by Eve Maler <elm@arbortext.com>.
  
    Where possible, great care has been used to reuse HTML tag
    names to reduce learning efforts and to allow HTML editors to be
    used for complex authorings like tables and lists.
  
  EXTENSIBILITY:
    This DTD includes several empty placeholders that can be used to
    extend it. These placeholders are implemented with empty entities. Here
    is the list of those empty entities and what they are used for:
  
      - local.inline: this entity should contain extended definitions of
                      elements that can be used 'inline', or directly inside
                      the content. An example for this entity could be
  
                          <!ENTITY % local.inline "|citation">
  
      - local.blocks: this entity should contain extended definitions of
                      elements that behave as 'blocks', thus can be visually
                      rendered as areas on the canvas. An example for this
                      entity could be:
  
                          <!ENTITY % local.blocks "|poem">
  
      - local.sections: this entity should contain extended definitions of
                        elements that behave as 'sections', thus can be considered
                        containers of block-level elements. An example for
                        this entity could be:
  
                          <!ENTITY % local.sections "|chapter">
  
      - local.headers: this entity should contain extended definitions of
                       elements that behave as parts of the document header.
                       An example for this header could be:
  
                          <!ENTITY % local.headers ", notes?">
  
      - local.footers: this entity should contain extended definitions of
                       elements that behave as parts of the document footer.
                       An example for this header could be:
  
                          <!ENTITY % local.footers ", annotations*">
  
  
  AUTHORS:
    Stefano Mazzocchi <stefano@apache.org>
    Steven Noels <stevenn@outerthought.org>
  
  FIXME:
    - should "form" tags be included?
  
  CHANGE HISTORY:
  [Version 1.0]
    19991121 Initial version. (SM)
    19991123 Replaced "res" with more standard "strong" for emphasis. (SM)
    19991124 Added "fork" element for window forking behavior. (SM)
    19991124 Added "img-inline" element to separate from "img". (SM)
    19991129 Removed "affiliation" from "author". (SM)
    19991129 Made "author" empty and moved "name|email" as attributes. (SM)
    19991215 Simplified table section. (SM)
    19991215 Changed "img-block" in more friendly "figure". (SM)
    20000125 Added the "icon" image. (SM)
    20000126 Allowed "anchor" in all levels. (SM)
    20000404 Removed the "role" attribute from common-xxx.att. (SM)
    20000815 Allowed "code" inside "strong" and "em". (SM)
  [Version 1.1]
    20011212 Used public identifiers for external entities. (SM)
    20011212 Removed xlink attributes since not used. (SM)
    20011212 Removed "connect" since not required at this level. (SM)
    20011218 Added "warning" as a block level object. (SM)
    20011218 Removed explicitly numbered sections ("s1|s2|s3|s4"). (SM)
    20011218 Added "section" element. (SM)
    20011218 Allowed "body" to have blocks without a section. (SM)
    20011218 Removed "sl" since not really different from "ul". (SM)
    20020214 Moved empty placeholder entity declarations up front (SNS)
    20020214 Corrected content model of content.mix parameter entity (SNS)
    20020519 The DTDs are now modular so various parts can be re-used (SNS)
    20020606 Made title into an child element of its parent instead of an attribute (SNS)
    20020613 Move the declarations of ISO character entity sets to module (DC)
  [Version 1.2]
    20030320 Make @href required for link elements. (SNS)
    20030320 Allow links (link|jump|fork) and inline elements (br|img|icon|acronym) inside title. (SNS)
    20030419 Allow inline content (strong|em|code|sub|sup|br|img|icon|acronym|link|jump|fork) in strong and em. (JT)
    20030419 Allow paragraphs (p|source|note|warning|fixme), table and figure|anchor inside li. (JT)
    20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside dd. (JT)
    20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside tables (td|dh). (JT)
  
  
  COPYRIGHT:
    Copyright (c) 2002,2003 The Apache Software Foundation.
  
    Permission to copy in any form is granted provided this notice is
    included in all copies. Permission to redistribute is granted
    provided this file is distributed untouched in all its parts and
    included files.
  
  ==================================================================== -->
  
  
  <!-- =============================================================== -->
  <!-- Include the Common ISO Character Entity Sets -->
  <!-- =============================================================== -->
  
  <!ENTITY % common-charents PUBLIC
      "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
      "common-charents-v10.mod">
  %common-charents;
  
  <!-- =============================================================== -->
  <!-- Document -->
  <!-- =============================================================== -->
  
  <!ENTITY % document PUBLIC
      "-//APACHE//ENTITIES Documentation V1.2//EN"
      "document-v12.mod">
  %document;
  
  <!-- =============================================================== -->
  <!-- End of DTD -->
  <!-- =============================================================== -->
  
  
  
  1.4       +1 -1      cocoon-2.1/src/documentation/xdocs/developing/portal/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/developing/portal/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	25 Jun 2003 13:33:25 -0000	1.3
  +++ index.xml	25 Jun 2003 19:47:38 -0000	1.4
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "../../dtd/document-v11.dtd">
  +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "../../dtd/document-v11.dtd">
   <document> 
     <header> 
       <title>Configuring the Cocoon Portal</title>