forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject svn commit: r264660 - in /forrest/trunk/main/webapp: locationmap.xml sitemap.xmap
Date Tue, 30 Aug 2005 00:02:24 GMT
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>
 



Mime
View raw message