cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/generators generators.xml book.xml
Date Wed, 26 May 2004 13:12:41 GMT
cziegeler    2004/05/26 06:12:41

  Modified:    tools/src/anttasks SitemapTask.java
               src/documentation/xdocs/userdocs/generators generators.xml
                        book.xml
  Log:
  Updating generator docs
  
  Revision  Changes    Path
  1.16      +23 -6     cocoon-2.1/tools/src/anttasks/SitemapTask.java
  
  Index: SitemapTask.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/SitemapTask.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SitemapTask.java	26 May 2004 11:37:05 -0000	1.15
  +++ SitemapTask.java	26 May 2004 13:12:40 -0000	1.16
  @@ -91,7 +91,7 @@
       private String directory;
       
       /** The name of the block */
  -    private String blockName;
  +    protected String blockName;
       
       /** Is this block deprecated? */
       protected boolean deprecated = false;
  @@ -320,14 +320,31 @@
               final String htmlName = docFile.getName().substring(0, docFile.getName().length()-3)
+ "html";
               Node oldEntry = XPathAPI.selectSingleNode(sectionNode, "menu-item[@href='"+htmlName+"']");
               Node newEntry = indexDoc.createElement("menu-item");
  -            ((Element)newEntry).setAttribute("href", htmlName);            
  -            ((Element)newEntry).setAttribute("label", capitalize(component.getName()) +
" " + capitalize(component.getType()));
  +            ((Element)newEntry).setAttribute("href", htmlName);  
  +            final String label = capitalize(component.getName()) + " " + capitalize(component.getType());
  +            ((Element)newEntry).setAttribute("label", label);
               if ( oldEntry != null ) {
                   oldEntry.getParentNode().replaceChild(newEntry, oldEntry);
               } else {
  -                sectionNode.appendChild(newEntry);
  +                Node nextLabel = null;
  +                final NodeList childs = sectionNode.getChildNodes();
  +                int i = 0;
  +                while ( nextLabel == null && i < childs.getLength() ) {
  +                    final Node current = childs.item(i);
  +                    if ( current instanceof Element ) {
  +                        final String currentLabel = ((Element)current).getAttribute("label");
  +                        if ( label.compareTo(currentLabel) < 0 ) {
  +                            nextLabel = current;
  +                        }
  +                    }
  +                    i++;
  +                }
  +                if ( nextLabel == null ) {
  +                    sectionNode.appendChild(newEntry);
  +                } else {
  +                    sectionNode.insertBefore(newEntry, nextLabel);
  +                }
               }
  -            // FIXME we should sort the entries!
               DocumentCache.writeDocument(indexFile, indexDoc, this);
           }
           
  
  
  
  1.8       +4 -26     cocoon-2.1/src/documentation/xdocs/userdocs/generators/generators.xml
  
  Index: generators.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/generators/generators.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- generators.xml	6 Mar 2004 02:25:35 -0000	1.7
  +++ generators.xml	26 May 2004 13:12:41 -0000	1.8
  @@ -39,35 +39,13 @@
           generator name must be declared as the default generator. Each generator may have
additional
           configuration information specified in child elements.
         </p>
  +      <p>On the left you see all generators that are available in Cocoon. The list
is separated into
  +        the core generators, belonging to the Cocoon core, and optional generators that
are part of
  +        specific blocks.
  +      </p>        
         <p>For conceptual information on generators see the user's guide document
           <link href="../concepts/sitemap.html">The Sitemap</link>.
         </p>
  -    </s1>
  -    <s1 title="The Generators in Apache Cocoon">
  -      <ul>
  -        <li><link href="directory-generator.html">Directory Generator</link></li>
  -        <li><link href="file-generator.html">File Generator</link> (The
default generator)</li>
  -        <li><link href="extractor-generator.html">Fragment Extractor Generator</link>
(optional: Batik block)</li>
  -        <li><link href="html-generator.html">HTML Generator</link> (optional:
HTML block)</li>
  -        <li><link href="imagedirectory-generator.html">Image Directory Generator</link></li>
  -        <li><link href="jsp-generator.html">JSP Generator</link> (optional:
JSP block)</li>
  -        <li><link href="linkstatus-generator.html">LinkStatus Generator</link></li>
  -        <li>MP3 Directory Generator (no documentation exists)</li>
  -        <li><link href="error-generator.html">Notifying Generator</link></li>
  -        <li><link href="php-generator.html">Php Generator</link> (optional:
PHP block)</li>
  -        <li><link href="profile-generator.html">Profile Generator</link>
(optional: Profiler block)</li>
  -        <li><link href="request-generator.html">Request Generator</link></li>
  -        <li><link href="script-generator.html">Script Generator</link>
(optional: BSF block)</li>
  -        <li><link href="search-generator.html">Search Generator</link>
(optional: Lucene block)</li>
  -        <li><link href="serverpages-generator.html">Server Pages Generator</link></li>
  -        <li><link href="status-generator.html">Status Generator</link></li>
  -        <li><link href="stream-generator.html">Stream Generator</link></li>
  -        <li><link href="velocity-generator.html">Velocity Generator</link>
(optional: Velocity block)</li>
  -        <li><link href="wsproxy-generator.html">Web Service Proxy Generator</link>
(optional: Proxy block)</li>
  -        <li><link href="xmldbcollection-generator.html">XML:DB Collection Generator</link>
(optional: XMLDB block)</li>
  -        <li><link href="xmldb-generator.html">XML:DB Generator</link>
(optional: XMLDB block)</li>
  -        <li><link href="xpathdirectory-generator.html">XPath Directory Generator</link></li>
  -      </ul>
       </s1>
     </body>
   </document>
  
  
  
  1.9       +1 -1      cocoon-2.1/src/documentation/xdocs/userdocs/generators/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/generators/book.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- book.xml	8 May 2004 08:57:57 -0000	1.8
  +++ book.xml	26 May 2004 13:12:41 -0000	1.9
  @@ -32,7 +32,6 @@
       <menu-item label="LinkStatus Generator" href="linkstatus-generator.html"/>
       <menu-item label="Notifying Generator" href="error-generator.html"/>
       <menu-item label="Request Generator" href="request-generator.html"/>
  -    <menu-item label="Server Pages Generator" href="serverpages-generator.html"/>
       <menu-item label="Status Generator" href="status-generator.html"/>
       <menu-item label="Stream Generator" href="stream-generator.html"/>
       <menu-item label="XPath Directory Generator" href="xpathdirectory-generator.html"/>
  @@ -45,6 +44,7 @@
       <menu-item label="Profile Generator" href="profile-generator.html"/>
       <menu-item label="Script Generator" href="script-generator.html"/>
       <menu-item label="Search Generator" href="search-generator.html"/>
  +    <menu-item label="Server Pages Generator" href="serverpages-generator.html"/>
       <menu-item label="Velocity Generator" href="velocity-generator.html"/>
       <menu-item label="Web Service Proxy Generator" href="wsproxy-generator.html"/>
       <menu-item label="XML:DB Collection Generator" href="xmldbcollection-generator.html"/>
  
  
  

Mime
View raw message