forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf aggregate.xmap linkmap.xmap menu.xmap sitemap.xmap
Date Sat, 05 Jul 2003 10:40:39 GMT
jefft       2003/07/05 03:40:39

  Modified:    src/resources/conf aggregate.xmap linkmap.xmap menu.xmap
                        sitemap.xmap
  Log:
  Move everything to do with the aggregated view into aggregate.xmap.  Also make
  aggregate.xmap completely generic (*.xmap), and then only 'bind' it to a
  specific URL in the caller (sitemap.xmap).  This means that if the user wants
  the aggregate page called something other than site.{html,pdf}, they can rename
  it by overriding just sitemap.xmap.
  
  Revision  Changes    Path
  1.3       +31 -7     xml-forrest/src/resources/conf/aggregate.xmap
  
  Index: aggregate.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/aggregate.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aggregate.xmap	10 Jun 2003 09:34:56 -0000	1.2
  +++ aggregate.xmap	5 Jul 2003 10:40:38 -0000	1.3
  @@ -1,6 +1,18 @@
   <?xml version="1.0"?>
  +<!-- ===============================================
  +Pipeline to generate an aggregated view of all the site's docs.
  +
  +This subsitemap defines both a source (*.xml) matcher, and a
  +linkmap (linkmap-*) matcher to redefine the internal links.
  +
  +Example URL:  Typically http://localhost:8888/site.pdf
  +Used by    :  sitemap.xmap, which binds the URL to this pipeline
  +Uses       :  cocoon://abs-linkmap, in linkmap.xmap
  +
  +$Revision$
  +==================================================== -->
  +
   
  -<!-- Subsitemap generating aggregated views of multiple XML docs -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     <map:components>
  @@ -17,12 +29,7 @@
     <map:pipelines>
       <map:pipeline>
         <!-- Aggregation of all XML in the site -->
  -      <map:match pattern="site.xml">
  -        <!--
  -        <map:generate src="cocoon://book-index.html"/>
  -        <map:generate src="cocoon://community/howto/abs-menulinks-index.html"/>
  -        <map:generate src="cocoon://abs-menulinks-faq.html"/>
  -        -->
  +      <map:match pattern="*.xml">
           <map:generate src="cocoon://abs-linkmap"/>
           <map:transform src="resources/stylesheets/site2book.xsl" />
           <map:transform src="resources/stylesheets/aggregates/book2cinclude.xsl">
  @@ -35,6 +42,23 @@
           <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-*.*">
  +        <map:generate src="cocoon://abs-linkmap" />
  +
  +        <map:transform src="resources/stylesheets/aggregates/relativize-split-linkmap.xsl">
  +          <map:parameter name="path" value="{1}.{2}" />
  +        </map:transform>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +
  +
       </map:pipeline>
  +
  +
     </map:pipelines>
   </map:sitemap>
  
  
  
  1.11      +2 -12     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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- linkmap.xmap	5 Jul 2003 06:49:12 -0000	1.10
  +++ linkmap.xmap	5 Jul 2003 10:40:38 -0000	1.11
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!-- =================================================
  -'linkmap' pipelines.  A linkmap is a map from abstract ('site:index') to
  +'linkmap' pipeline.  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)
  @@ -30,16 +30,6 @@
           <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">
  -          <map:parameter name="path" value="{1}site.{2}" />
  -        </map:transform>
  -        <map:serialize type="xml"/>
  -      </map:match>
   
         <!-- Linkmap for regular pages -->
         <map:match pattern="**linkmap-*">
  
  
  
  1.2       +8 -1      xml-forrest/src/resources/conf/menu.xmap
  
  Index: menu.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/menu.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- menu.xmap	5 Jul 2003 06:49:12 -0000	1.1
  +++ menu.xmap	5 Jul 2003 10:40:38 -0000	1.2
  @@ -24,6 +24,10 @@
   
     <map:pipelines>
   
  +    <!-- ============================================================ -->
  +    <!-- SOURCE FORMATS                                               -->
  +    <!-- ============================================================ -->
  +
       <map:pipeline internal-only="false">
   
         <map:match pattern="**menulinks-*">
  @@ -55,6 +59,9 @@
         </map:match>
       </map:pipeline>
   
  +    <!-- ============================================================ -->
  +    <!-- INTERMEDIATE FORMATS                                         -->
  +    <!-- ============================================================ -->
   
       <map:pipeline>
         <map:match pattern="**book-*">
  
  
  
  1.107     +14 -6     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.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- sitemap.xmap	5 Jul 2003 09:41:31 -0000	1.106
  +++ sitemap.xmap	5 Jul 2003 10:40:38 -0000	1.107
  @@ -177,18 +177,26 @@
             <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
           </map:match>
   
  -        <map:match pattern="**.xml">
  -          <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
  -        </map:match>
  +        <!-- Default source types -->
  +        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
  +
         </map:match>
   
         <!-- Menu content -->
  -      <map:match pattern="**menulinks*">
  +      <map:match pattern="**menulinks-*">
           <map:mount uri-prefix="" src="menu.xmap" check-reload="yes" />
         </map:match>
   
  -      <!-- Link mappings -->
  -      <map:match pattern="**linkmap*">
  +      <!-- Link maps -->
  +      <map:match pattern="abs-linkmap">
  +        <map:mount uri-prefix="" src="linkmap.xmap"/>
  +      </map:match>
  +
  +      <map:match pattern="**linkmap-*">
  +        <map:match pattern="linkmap-site.*">
  +          <map:mount uri-prefix="" src="aggregate.xmap" check-reload="yes" />
  +        </map:match>
  +
           <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
         </map:match>
   
  
  
  

Mime
View raw message