jefft       2003/07/04 23:49:12

  Modified:    src/resources/conf cocoon.xconf linkmap.xmap sitemap.xmap
               src/resources/fresh-site forrest.properties
  Added:       src/resources/conf menu.xmap
  Removed:     src/resources/conf linkmap-tabs.xmap navigation.xmap
  Log:
  - Move all menu pipelines into menu.xmap.  Previously they were split between
    linkmap-*.xmap (site.xml-derived stuff) and navigation.xmap.
  - Parametrized the menu creation algorithm in forrest.properties.  Previously,
    users had to edit sitemap.xmap and delegate to either linkmap.xmap or
    linkmap-tabs.xmap.
  
  Revision  Changes    Path
  1.21      +1 -0      xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- cocoon.xconf	22 Jun 2003 12:30:03 -0000	1.20
  +++ cocoon.xconf	5 Jul 2003 06:49:11 -0000	1.21
  @@ -161,6 +161,7 @@
       <component-instance name="defaults"       class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
         <values>
           <skin>@skin@</skin>
  +        <menu-scheme>@menu-scheme@</menu-scheme>
         </values>
       </component-instance>
   
  
  
  
  1.10      +15 -29    xml-forrest/src/resources/conf/linkmap.xmap
  
  Index: linkmap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/linkmap.xmap,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- linkmap.xmap	10 Jun 2003 09:34:56 -0000	1.9
  +++ linkmap.xmap	5 Jul 2003 06:49:12 -0000	1.10
  @@ -1,4 +1,14 @@
   <?xml version="1.0"?>
  +<!-- =================================================
  +'linkmap' pipelines.  A linkmap is a map from abstract ('site:index') to
  +physical ('../index.html') links for the current page.
  +
  +Example URL:  http://localhost:8888/community/linkmap-index.html (links for community/index.html)
  +Used by    :  The linkrewriter transformer
  +Uses       :  content/xdocs/site.xml
  +
  +$Revision$
  +==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     <map:components>
  @@ -10,20 +20,19 @@
       <map:selectors default="browser"/>
     </map:components>
   
  -  <map:resources>
  -  </map:resources>
  -
     <map:pipelines>
       <map:pipeline>
   
  -      <!-- Used by **/linkmap-* -->
  +      <!-- site.xml with @href's appended to be context-relative. -->
         <map:match pattern="abs-linkmap">
           <map:generate src="content/xdocs/site.xml" />
           <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
           <map:serialize type="xml" />
         </map:match>
   
  -
  +      <!-- Special linkmap for pages containing aggregated content.  Links to aggregated content should be internal
  +      (fragment identifiers), and other links should be regular hrefs.  The 'split' between these two types is decided
  +      by the stylesheet. -->
         <map:match pattern="**linkmap-site.*">
           <map:generate src="cocoon://abs-linkmap" />
           <map:transform src="resources/stylesheets/aggregates/relativize-split-linkmap.xsl">
  @@ -32,35 +41,12 @@
           <map:serialize type="xml"/>
         </map:match>
   
  -      <!-- A linkmap (map from abstract to physical links) for the current page -->
  -      <!-- Used by the linkrewriter transformer -->
  +      <!-- Linkmap for regular pages -->
         <map:match pattern="**linkmap-*">
           <map:generate src="cocoon://abs-linkmap" />
           <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
             <map:parameter name="path" value="{1}{2}" />
             <map:parameter name="site-root" value="{conf:project-url}" />
  -        </map:transform>
  -        <map:serialize type="xml" />
  -      </map:match>
  -
  -      <!-- A list of absolute links for the current page's menu -->
  -      <!-- Used by menulinks/** -->
  -      <map:match pattern="**abs-menulinks-*">
  -        <map:generate src="cocoon://abs-linkmap" />
  -        <map:transform type="xpath">
  -          <map:parameter name="include" value="//*[@href='{1}']" />
  -        </map:transform>
  -        <map:serialize type="xml" />
  -      </map:match>
  -
  -      <!-- A list of relative links for the current page's menu -->
  -      <!-- Used when generating book.xml from a site.xml.  The /** suffix
  -      identifies a @href prefix which all nodes in the
  -      returned subtree must have. -->
  -      <map:match pattern="**menulinks-*">
  -        <map:generate src="cocoon://{1}abs-menulinks-{2}" />
  -        <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
  -          <map:parameter name="path" value="{1}{2}" />
           </map:transform>
           <map:serialize type="xml" />
         </map:match>
  
  
  
  1.105     +9 -12     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- sitemap.xmap	23 Jun 2003 10:48:02 -0000	1.104
  +++ sitemap.xmap	5 Jul 2003 06:49:12 -0000	1.105
  @@ -134,6 +134,14 @@
         <!--                 Raw XML sources, typically doc-v11 format    -->
         <!-- ============================================================ -->
   
  +      <map:match pattern="**linkmap*">
  +        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
  +      </map:match>
  +
  +      <map:match pattern="**menulinks*">
  +        <map:mount uri-prefix="" src="menu.xmap" check-reload="yes" />
  +      </map:match>
  +
         <map:match pattern="changes.xml">
           <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
         </map:match>
  @@ -146,14 +154,6 @@
           <map:mount uri-prefix="" src="dtd.xmap" check-reload="yes" />
         </map:match>
   
  -      <map:match pattern="**linkmap*">
  -        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
  -      </map:match>
  -
  -      <map:match pattern="**menulinks*">
  -        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
  -      </map:match>
  -
         <map:match pattern="**issues.xml">
           <map:mount uri-prefix="" src="issues.xmap" check-reload="yes" />
         </map:match>
  @@ -238,11 +238,8 @@
         </map:match>
   
         <map:match pattern="**book-*.html">
  -        <map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
  +        <map:mount uri-prefix="" src="menu.xmap" check-reload="yes" />
         </map:match>
  -
  -
  -
   
       </map:pipeline>
   
  
  
  
  1.1                  xml-forrest/src/resources/conf/menu.xmap
  
  Index: menu.xmap
  ===================================================================
  <?xml version="1.0"?>
  <!-- ===============================================
  'book.xml' pipeline, which generates XML that becomes the menu.
  
  Example URL:  http://localhost:8888/community/book-index.html (menu for community/index.html)
  Used by    :  **/menu-*.html in sitemap.xmap, 
  Uses       :  content/xdocs/site.xml, or book.xml file if present.
  
  $Revision: 1.1 $
  ==================================================== -->
  
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
    <map:components>
      <map:generators default="file"/>
      <map:serializers default="html"/>
      <map:transformers default="xslt"/>
      <map:readers default="resource"/>
      <map:matchers default="wildcard"/>
      <map:selectors default="browser">
        <map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
      </map:selectors>
  
    </map:components>
  
    <map:pipelines>
  
      <map:pipeline internal-only="false">
  
        <map:match pattern="**menulinks-*">
          <map:generate src="content/xdocs/site.xml" />
          <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
  
          <map:select type="config">
            <map:parameter name="value" value="{defaults:menu-scheme}"/>
  
            <map:when test="tab_attributes">
              <map:transform src="resources/stylesheets/site2site-normalizetabs.xsl" />
              <map:transform src="resources/stylesheets/site2site-selectnode.xsl">
                <map:parameter name="path" value="{1}{2}"/>
              </map:transform>
            </map:when>
  
            <map:when test="directories">
              <map:transform type="xpath">
                <map:parameter name="include" value="//*[@href='{1}']" />
              </map:transform>
            </map:when>
  
            </map:select>
  
          <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
            <map:parameter name="path" value="{1}{2}" />
          </map:transform>
          <map:serialize type="xml" />
        </map:match>
      </map:pipeline>
  
  
      <map:pipeline>
        <map:match pattern="**book-*">
  
          <map:select type="exists">
  
            <map:when test="content/xdocs/{1}book.xml">
              <!-- If a hand-created book.xml exists, use it -->
              <map:parameter name="url" value="content/xdocs/{1}book.xml" />
              <map:generate src="content/xdocs/{1}book.xml" />
              <map:serialize type="xml"/>
            </map:when>
  
            <map:otherwise>
              <!-- If no book.xml, generate it from the linkmap. -->
              <map:generate src="cocoon:/{1}menulinks-{2}" />
              <!-- The above generates the subset of the linkmap relevant to our directory. -->
              <map:transform src="resources/stylesheets/site2book.xsl" />
              <map:serialize type="xml"/>
            </map:otherwise>
  
          </map:select>
  
        </map:match>
  
      </map:pipeline>
  
  
    </map:pipelines>
  </map:sitemap>
  
  
  
  1.27      +5 -0      xml-forrest/src/resources/fresh-site/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- forrest.properties	22 Jun 2003 06:29:30 -0000	1.26
  +++ forrest.properties	5 Jul 2003 06:49:12 -0000	1.27
  @@ -15,6 +15,11 @@
   
   
   ##############
  +# behavioural properties
  +#project.menu-scheme=tab_attributes
  +#project.menu-scheme=directories
  +
  +##############
   # layout properties
   
   # Properties that must be set to override the default locations