forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r328767 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer: linkmap.xmap menu.xmap
Date Thu, 27 Oct 2005 00:51:45 GMT
Author: crossley
Date: Wed Oct 26 17:51:40 2005
New Revision: 328767

URL: http://svn.apache.org/viewcvs?rev=328767&view=rev
Log:
Use the new cocoon://site.navigation.links.xml
which was added at r328576

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/menu.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap?rev=328767&r1=328766&r2=328767&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
Wed Oct 26 17:51:40 2005
@@ -51,17 +51,7 @@
       </map:match>
        <!-- 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.xml.xml-namespace-stripped}" />
 	<map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/menu.xmap?rev=328767&r1=328766&r2=328767&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/menu.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/menu.xmap
Wed Oct 26 17:51:40 2005
@@ -59,17 +59,7 @@
     <!-- ============================================================ -->
     <map:pipeline internal-only="false">
       <map:match pattern="abs-menulinks">
-        <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="{forrest:stylesheets}/absolutize-linkmap.xsl" />
         <map:transform src="{forrest:stylesheets}/site-to-site-normalizetabs.xsl" 
@@ -78,17 +68,7 @@
         <map:serialize type="xml"/>
       </map:match>
       <map:match pattern="**menulinks-*">
-        <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="{forrest:stylesheets}/absolutize-linkmap.xsl" />
         <map:select type="config">
@@ -150,4 +130,4 @@
       </map:match>
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>



Mime
View raw message