Return-Path: 
 <svn-return-65-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 27257 invoked from network); 21 Jun 2004 15:33:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 21 Jun 2004 15:33:06 -0000
Received: (qmail 45367 invoked by uid 500); 21 Jun 2004 15:27:54 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 41451 invoked by uid 500); 21 Jun 2004 15:26:49 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 35790 invoked by uid 99); 21 Jun 2004 15:25:38 -0000
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Mon, 21 Jun 2004 08:25:38 -0700
Received: (qmail 18012 invoked by uid 65534); 21 Jun 2004 15:25:26 -0000
Date: 21 Jun 2004 15:25:26 -0000
Message-ID: <20040621152526.18006.qmail@minotaur.apache.org>
From: nicolaken@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 21543 - in forrest/trunk/src/core/context: . WEB-INF
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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">