forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: rev 43604 - in forrest/trunk/src/core/context: . WEB-INF
Date Thu, 09 Sep 2004 14:37:49 GMT
Author: rgardler
Date: Thu Sep  9 07:37:48 2004
New Revision: 43604

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:
reversing ability to mount custom link, menu and tabs .xmap files - such customisations should
go in the custom sitemap.xmap instead

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	Thu Sep  9 07:37:48 2004
@@ -120,9 +120,6 @@
       <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	Thu Sep  9 07:37:48 2004
@@ -48,9 +48,6 @@
 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	Thu Sep  9 07:37:48 2004
@@ -38,21 +38,6 @@
   </map:components>
 
   <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:linkmapxmap}">
-           <map:mount uri-prefix="" 
-                      src="{project:linkmapxmap}" 
-                      check-reload="yes" 
-                      pass-through="true"/>
-         </map:when>  
-       </map:select>
-     </map:pipeline>
  
      <map:pipeline>     
       <map:match pattern="linkmap.xml">

Modified: forrest/trunk/src/core/context/menu.xmap
==============================================================================
--- forrest/trunk/src/core/context/menu.xmap	(original)
+++ forrest/trunk/src/core/context/menu.xmap	Thu Sep  9 07:37:48 2004
@@ -58,21 +58,6 @@
     <!-- SOURCE FORMATS                                               -->
     <!-- ============================================================ -->
 
-      <!-- 
-         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:pipeline internal-only="false">
       <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	Thu Sep  9 07:37:48 2004
@@ -65,22 +65,6 @@
   </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