You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by ni...@apache.org on 2004/06/21 17:25:26 UTC
svn commit: rev 21543 - in forrest/trunk/src/core/context: . WEB-INF
Author: nicolaken
Date: Mon Jun 21 08:25:24 2004
New Revision: 21543
Modified:
forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
forrest/trunk/src/core/context/default-forrest.properties
forrest/trunk/src/core/context/sitemap.xmap
Log:
Mount a sitemap if it's found in the project dir
(location and filename configurable via forrest.properties)
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 Jun 21 08:25:24 2004
@@ -118,6 +118,7 @@
<component-instance name="project" class="org.apache.forrest.conf.ForrestConfModule">
<values>
<skin>@project.skin@</skin>
+ <sitemap>@project.home@/@project.sitemap@</sitemap>
<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 Jun 21 08:25:24 2004
@@ -49,6 +49,7 @@
project.raw-content-dir=${project.content-dir}/content
project.conf-dir=${project.content-dir}/conf
project.sitemap-dir=${project.content-dir}
+project.sitemap=${project.content-dir}/sitemap.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/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap (original)
+++ forrest/trunk/src/core/context/sitemap.xmap Mon Jun 21 08:25:24 2004
@@ -216,6 +216,14 @@
<map:pipelines>
<map:pipeline internal-only="false">
+ <map:select type="exists">
+ <map:when test="{project:sitemap}">
+ <map:mount uri-prefix="" src="{project:sitemap}" check-reload="yes" />
+ </map:when>
+ </map:select>
+ </map:pipeline>
+
+ <map:pipeline internal-only="false">
<map:match pattern="skinconf.xml">
<map:generate src="{project:skinconf}" />
<map:select type="exists">