Return-Path: 
 <svn-return-3469-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 990 invoked from network); 30 Aug 2005 00:02:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 30 Aug 2005 00:02:26 -0000
Received: (qmail 60181 invoked by uid 500); 30 Aug 2005 00:02:26 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 60130 invoked by uid 500); 30 Aug 2005 00:02:26 -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>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 60117 invoked by uid 99); 30 Aug 2005 00:02:25 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2005 17:02:25 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 29 Aug 2005 17:02:42 -0700
Received: (qmail 958 invoked by uid 65534); 30 Aug 2005 00:02:25 -0000
Message-ID: <20050830000225.957.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r264660 - in /forrest/trunk/main/webapp: locationmap.xml
 sitemap.xmap
Date: Tue, 30 Aug 2005 00:02:24 -0000
To: svn@forrest.apache.org
From: twilliams@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: twilliams
Date: Mon Aug 29 17:02:15 2005
New Revision: 264660

URL: http://svn.apache.org/viewcvs?rev=264660&view=rev
Log:
use locationmap's mounting capability to allow selective project location overrides.

Modified:
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/sitemap.xmap

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=264660&r1=264659&r2=264660&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Mon Aug 29 17:02:15 2005
@@ -26,8 +26,15 @@
         name="lm" 
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
   </components>
   
   <locator>
+    <select>
+      <mount src="{project:content}locationmap.xml"/>
+    </select>
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=264660&r1=264659&r2=264660&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Mon Aug 29 17:02:15 2005
@@ -386,14 +386,7 @@
         </map:match>
    
         <map:match pattern="locationmap.xml">
-          <map:select type="exists">
-            <map:when test="{project:content}/locationmap.xml">
-              <map:generate src="{project:content}/locationmap.xml" />
-            </map:when>
-            <map:otherwise>
-              <map:generate src="{forrest:locationmap}" />
-            </map:otherwise>
-          </map:select>
+          <map:generate src="{forrest:locationmap}" />
           <map:serialize type="xml"/>
         </map:match>