svn commit: r413292 - in /forrest/trunk/main/fresh-site/src/documentation: content/xdocs/samples/locationmap/index.xml sitemap.xmap

[cr...@apache.org]

Author: crossley
Date: Sat Jun 10 06:22:23 2006
New Revision: 413292

URL: http://svn.apache.org/viewvc?rev=413292&view=rev
Log:
Fix the locationmap remoteDemo.
Add match to project sitemap.
Enhance the text explaining the demo and give explicit examples.
Thanks to everyone at Forrest Friday for the help.
Issue: FOR-876

Modified:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
    forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml?rev=413292&r1=413291&r2=413292&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Sat Jun 10 06:22:23 2006
@@ -61,14 +61,29 @@
         you can enter the URL into the browser and it will work (however, note the 
         issue described below, regarding the site: and ext: protocols).</note>
         
-        <p>The locationmap matcher for the link above is:</p>
+        <p>Go to <code>localhost:8888/remoteDemo/index.html</code>
+          which will virtually re-load this page. However, rather than use
+          the local xml source, the locationamp has retrieved the up-to-date
+          source directly from the svn server.
+          Similarly <code>localhost:8888/remoteDemo/samples/index.html</code>
+        </p>
+        <p>The match in src/documentation/content/locationmap.xml for this demo is ...</p>
         
         <source>
  &lt;match pattern="remoteDemo/**.xml"&gt;
    &lt;location src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml" /&gt;
  &lt;/match&gt;
         </source>
-      
+        <p>See the src/documentation/content/sitemap.xmap for the match
+          that handles these remoteDemo requests ...
+        </p>
+      <source><![CDATA[
+<map:match pattern="remoteDemo/**.xml">
+  <map:generate src="{lm:remoteDemo/{1}.xml}"/>
+  <!-- or to abbreviate: <map:generate src="{lm:{0}}"/> -->
+  <map:serialize type="xml"/>
+</map:match>
+]]></source>
         <p>Note that because this is a wildcard matcher you can request any page
         from SVN simply by requesting 
         <code>/remoteDemo/PATH/TO/FILE/FILENAME.html</code>. In addition, we

Modified: forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap?rev=413292&r1=413291&r2=413292&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap Sat Jun 10 06:22:23 2006
@@ -49,6 +49,13 @@
   
  <map:pipelines>
   <map:pipeline>
+
+    <!-- Locationmap demonstration -->
+    <map:match pattern="remoteDemo/**.xml">
+     <map:generate src="{lm:{0}}"/>
+     <map:serialize type="xml"/>
+    </map:match>
+
     <map:match pattern="old_site/*.html">
      <map:select type="exists">
       <map:when test="{project:content}{1}.html">