forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: rev 43428 - in forrest/trunk/src/core/context: . WEB-INF
Date Mon, 06 Sep 2004 20:57:34 GMT
Author: rgardler
Date: Mon Sep  6 13:57:34 2004
New Revision: 43428

Modified:
   forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
   forrest/trunk/src/core/context/default-forrest.properties
   forrest/trunk/src/core/context/linkmap.xmap
   forrest/trunk/src/core/context/menu.xmap
   forrest/trunk/src/core/context/tabs.xmap
Log:
add ability to override linkmap, menu and tabs .xmap files to allow the generation of site.xml
and tabs.xml from other source files such as imsmanifests for IMS content packages

Modified: forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
==============================================================================
--- forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	(original)
+++ forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	Mon Sep  6 13:57:34 2004
@@ -120,6 +120,9 @@
       <values>
         <skin>@project.skin@</skin>
         <sitemap>@project.home@/@project.sitemap@</sitemap>
+        <tabsxmap>@project.home@/@project.tabsxmap@</tabsxmap>
+        <linkmapxmap>@project.home@/@project.linkmapxmap@</linkmapxmap>
+        <menuxmap>@project.home@/@project.menuxmap@</menuxmap>
         <status>@project.home@/@project.status@</status>
         <skinconf>@project.home@/@project.skinconf@</skinconf>        
         <doc>@project.home@/@project.content-dir@/</doc>

Modified: forrest/trunk/src/core/context/default-forrest.properties
==============================================================================
--- forrest/trunk/src/core/context/default-forrest.properties	(original)
+++ forrest/trunk/src/core/context/default-forrest.properties	Mon Sep  6 13:57:34 2004
@@ -49,6 +49,9 @@
 project.conf-dir=${project.content-dir}/conf
 project.sitemap-dir=${project.content-dir}
 project.sitemap=${project.content-dir}/sitemap.xmap
+project.tabsxmap=${project.content-dir}/tabs.xmap
+project.menuxmap=${project.content-dir}/menu.xmap
+project.linkmapxmap=${project.content-dir}/linkmap.xmap
 project.xdocs-dir=${project.content-dir}/content/xdocs
 project.resources-dir=${project.content-dir}/resources
 project.stylesheets-dir=${project.resources-dir}/stylesheets

Modified: forrest/trunk/src/core/context/linkmap.xmap
==============================================================================
--- forrest/trunk/src/core/context/linkmap.xmap	(original)
+++ forrest/trunk/src/core/context/linkmap.xmap	Mon Sep  6 13:57:34 2004
@@ -38,8 +38,23 @@
   </map:components>
 
   <map:pipelines>
-    <map:pipeline>
+    
+    <!-- 
+       This is the user pipeline, that can answer requests instead
+       of the Forrest one, or let requests pass through.
+    -->
+    <map:pipeline internal-only="false">
+       <map:select type="exists">
+         <map:when test="{project:linkmapxmap}">
+           <map:mount uri-prefix="" 
+                      src="{project:linkmapxmap}" 
+                      check-reload="yes" 
+                      pass-through="true"/>
+         </map:when>  
+       </map:select>
+     </map:pipeline>
 
+     <map:pipeline>
       <!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
         <map:generate src="{project:content.xdocs}site.xml" />

Modified: forrest/trunk/src/core/context/menu.xmap
==============================================================================
--- forrest/trunk/src/core/context/menu.xmap	(original)
+++ forrest/trunk/src/core/context/menu.xmap	Mon Sep  6 13:57:34 2004
@@ -59,6 +59,21 @@
     <!-- ============================================================ -->
 
     <map:pipeline internal-only="false">
+  
+      <!-- 
+         This is the user pipeline, that can answer requests instead
+         of the Forrest one, or let requests pass through.
+      -->
+      <map:pipeline internal-only="false">
+           <map:select type="exists">
+             <map:when test="{project:menuxmap}">
+               <map:mount uri-prefix="" 
+                          src="{project:menuxmap}" 
+                          check-reload="yes" 
+                          pass-through="true"/>
+             </map:when>  
+           </map:select>
+      </map:pipeline>
 
       <map:match pattern="abs-menulinks">
         <map:generate src="{project:content.xdocs}site.xml" />

Modified: forrest/trunk/src/core/context/tabs.xmap
==============================================================================
--- forrest/trunk/src/core/context/tabs.xmap	(original)
+++ forrest/trunk/src/core/context/tabs.xmap	Mon Sep  6 13:57:34 2004
@@ -65,6 +65,22 @@
   </map:resources>
 
   <map:pipelines>
+    
+    <!-- 
+       This is the user pipeline, that can answer requests instead
+       of the Forrest one, or let requests pass through.
+    -->
+    <map:pipeline internal-only="false">
+         <map:select type="exists">
+           <map:when test="{project:tabsxmap}">
+             <map:mount uri-prefix="" 
+                        src="{project:tabsxmap}" 
+                        check-reload="yes" 
+                        pass-through="true"/>
+           </map:when>  
+         </map:select>
+    </map:pipeline>
+      
     <map:pipeline >
       <map:match pattern="**tab-*.html">
         <map:generate src="{project:content.xdocs}tabs.xml"/>

Mime
View raw message