forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r328576 - in /forrest/trunk/main/webapp: linkmap.xmap menu.xmap sitemap.xmap
Date Wed, 26 Oct 2005 06:41:30 GMT
Author: crossley
Date: Tue Oct 25 23:41:24 2005
New Revision: 328576

URL: http://svn.apache.org/viewcvs?rev=328576&view=rev
Log:
The "navigation and links" file (site.xml) is used from three
different places, so consolidate them and use cocoon://...
Also use the locationmap.

Modified:
    forrest/trunk/main/webapp/linkmap.xmap
    forrest/trunk/main/webapp/menu.xmap
    forrest/trunk/main/webapp/sitemap.xmap

Modified: forrest/trunk/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/linkmap.xmap?rev=328576&r1=328575&r2=328576&view=diff
==============================================================================
--- forrest/trunk/main/webapp/linkmap.xmap (original)
+++ forrest/trunk/main/webapp/linkmap.xmap Tue Oct 25 23:41:24 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,17 +54,7 @@
       
       <!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
-			  <map:select type="exists">
-          <map:when test="{project:content.xdocs}site.xml">
-            <map:generate src="{project:content.xdocs}site.xml"/>
-          </map:when>
-          <map:when test="{lm:site.xml}">
-            <map:generate src="{lm:site.xml}"/>
-          </map:when>
-          <map:otherwise>
-            <map:generate src="{project:content.xdocs}site.xml"/>
-          </map:otherwise>
-        </map:select>
+        <map:generate src="cocoon://site.navigation.links.xml"/>
         <map:transform type="xinclude"/>
 	<map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:serialize type="xml" />

Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/menu.xmap?rev=328576&r1=328575&r2=328576&view=diff
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Tue Oct 25 23:41:24 2005
@@ -25,7 +25,7 @@
 Used by    :  **/menu-*.html in sitemap.xmap, 
 Uses       :  content/xdocs/site.xml, or book.xml file if present.
 
-See http://forrest.apache.org/docs/sitemap-ref.html#menu_xml_generation
+See http://forrest.apache.org/docs/sitemap-ref.html#menu_generation_impl
 
 $Revision: 1.2 $
 ==================================================== -->
@@ -61,7 +61,7 @@
 
     <map:pipeline internal-only="false">
       <map:match pattern="abs-menulinks">
-        <map:generate src="{lm:project.xml.site}"/>
+        <map:generate src="cocoon://site.navigation.links.xml"/>
         <map:transform type="xinclude"/>
         <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:transform src="{lm:transform.linkmap.linkmap-normalizedtabs}" />
@@ -70,7 +70,7 @@
       </map:match>
 
       <map:match pattern="**menulinks-*">
-        <map:generate src="{lm:project.xml.site}"/>
+        <map:generate src="cocoon://site.navigation.links.xml"/>
         <map:transform type="xinclude"/>
         <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:select type="config">

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=328576&r1=328575&r2=328576&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Tue Oct 25 23:41:24 2005
@@ -317,6 +317,21 @@
       </map:match>
     </map:pipeline>
 
+    <!-- The navigation and links file "site.xml" -->
+    <map:pipeline internal-only="true">
+      <map:match pattern="site.navigation.links.xml">
+        <map:select type="exists">
+          <map:when test="{lm:project.xml.site}">
+            <map:generate src="{lm:project.xml.site}"/>
+          </map:when>
+          <map:when test="{lm:site.xml}">
+            <map:generate src="{lm:site.xml}"/>
+          </map:when>
+        </map:select>
+        <map:serialize type="xml"/>
+      </map:match>
+    </map:pipeline>
+
     <map:pipeline type="caching" internal-only="true">
       <map:match pattern="*.xlex">
         <map:select type="exists">



Mime
View raw message