svn commit: r328847 - in /forrest/trunk: main/webapp/locationmap.xml main/webapp/sitemap.xmap site-author/content/xdocs/docs_0_80/locationmap.xml

[rg...@apache.org]

Author: rgardler
Date: Thu Oct 27 03:17:13 2005
New Revision: 328847

URL: http://svn.apache.org/viewcvs?rev=328847&view=rev
Log:
resolve the project lcoationmap via the sitemap, this allows projects to override the match if they want to generate the locationmap dynamically

Modified:
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=328847&r1=328846&r2=328847&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Thu Oct 27 03:17:13 2005
@@ -37,7 +37,7 @@
     <!-- Mount project specific locationmap -->
     <!-- ================================== -->
     <select>
-      <mount src="{project:content}locationmap.xml"/>
+      <mount src="cocoon://locationmap-project.xml"/>
     </select>     
     
     <!-- ================================== -->

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=328847&r1=328846&r2=328847&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Thu Oct 27 03:17:13 2005
@@ -316,6 +316,15 @@
         <map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
       </map:match>
     </map:pipeline>
+    
+    <!-- Project supplied locationmap. Projects can override this
+         matcher if they want to generate the locationmap dynamically -->
+		<map:pipeline internal-only="true">   
+       <map:match pattern="locationmap-project.xml">
+         <map:generate src="{project:content}locationmap.xml"/>
+         <map:serialize type="xml"/>
+       </map:match>
+		</map:pipeline>
 
     <!-- The navigation and links file "site.xml" -->
     <map:pipeline internal-only="true">

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml?rev=328847&r1=328846&r2=328847&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml Thu Oct 27 03:17:13 2005
@@ -52,9 +52,19 @@
       a location string.</p>
       
       <p>Apache Forrest looks in the standard location for the source file first (by default
-      <code>PROJECT_HOME/src/documentation/content/xdocs/...</code>), if a file is found in this
+      <code>PROJECT_HOME/src/documentation/content/...</code>), if a file is found in this
       location then the locationmap is not consulted. However, if one is not found then the 
-      locationmap is used to resolve the source file.</p>
+      locationmap is used to resolve the source file. The locationmap is resolved via the
+      core sitemap, this means that you can generate it dynamically if you so wish. Simply
+      add a match that looks something like this to your projects sitemap:</p>
+      
+      <source><![CDATA[
+   <map:match pattern="locationmap-project.xml">
+     <map:generate src="..."/>
+     <map:transform src="..."/>
+     <map:serialize type="xml"/>
+   </map:match>
+      ]]></source>
       
     </section>
     
@@ -111,7 +121,7 @@
   </section>
   
   <section id="selector">
-    <title>Location Selectors</title>
+    <title>Multiple Location Selectors</title>
     <p>You can define multiple possble locations for a file in the locationmap
     with the following code:</p>