Author: thorsten
Date: Tue Mar 27 16:29:26 2007
New Revision: 523113
URL: http://svn.apache.org/viewvc?view=rev&rev=523113
Log:
FOR-861
Updating rewrite and remote demo of the locationmap to
follow our naming convention. This allowed to remove the
match in the sitemap.
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml?view=diff&rev=523113&r1=523112&r2=523113
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml Tue
Mar 27 16:29:26 2007
@@ -42,13 +42,12 @@
</select>
-->
- <match pattern="rewriteDemo/**">
+ <match pattern="project.rewrite.**">
<location src="http://cocoon.apache.org/{1}.html"/>
</match>
- <match pattern="remoteDemo/**.xml">
+ <match pattern="project.remote.**.xml">
<location
src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml"/>
</match>
-
<!--
* Can use a selector inside a match. *
<match pattern="somepattern/**">
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?view=diff&rev=523113&r1=523112&r2=523113
==============================================================================
---
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
Tue Mar 27 16:29:26 2007
@@ -52,7 +52,7 @@
This is useful if you want to pull files from different directory
structures,
oe even remote repositories.</p>
- <p>The target of "/remoteDemo/*.html"
+ <p>The target of "/remote.**.html"
is generated from a source retrieved from the Forrest SVN.</p>
<note>Because the above URL retrieves the source file from SVN it will
@@ -61,32 +61,30 @@
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>Go to <code>localhost:8888/remoteDemo/index.html</code>
+ <p>Go to <code>http://localhost:8888/remote.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>
+ Similarly
<code>http://localhost:8888/remote.samples/index.html</code>
</p>
<p>The match in src/documentation/content/locationmap.xml for this
demo is ...</p>
<source>
- <match pattern="remoteDemo/**.xml">
+ <match pattern="project.remote.**.xml">
<location
src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml";
/>
</match>
</source>
- <p>See the src/documentation/content/sitemap.xmap for the match
- that handles these remoteDemo requests ...
- </p>
+ <p>Since we are using the locationmap naming convention, our new match
get resolved
+ via the core forrest.xmap and we do not have to change any other
files.</p>
<source><![CDATA[
-<map:match pattern="remoteDemo/**.xml">
- <map:generate src="{lm:remoteDemo/{1}.xml}"/>
- <!-- or to abbreviate: <map:generate src="{lm:{0}}"/> -->
+<map:match pattern="**.xml">
+ <map:generate src="{lm:project.{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
+ <code>/remote.PATH/TO/FILE/FILENAME.html</code>. In addition, we
can request any other output format available via Forrest plugins.</p>
<p>When including resources from remote repositories one has to
@@ -102,13 +100,13 @@
<p>The locationmap can be used to rewrite URLs when the page is
generated.
For example, when the locationmap has:</p>
<source>
- <match pattern="rewriteDemo/**">
+ <match pattern="project.rewrite.**">
<location src="http://cocoon.apache.org/{1}.html"; />
</match>
</source>
- <p><a href="lm:rewriteDemo/index">This link is rewritten to
+ <p><a href="lm:rewrite.index">This link is rewritten to
an offsite address</a> not
- specified in the link, which has
<code>href="lm:rewriteDemo/index"</code>.</p>
+ specified in the link, which has
<code>href="lm:rewrite.index"</code>.</p>
</section>
</section>
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?view=diff&rev=523113&r1=523112&r2=523113
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap Tue Mar 27
16:29:26 2007
@@ -50,12 +50,6 @@
<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="{properties:content}{1}.html">
Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml?view=diff&rev=523113&r1=523112&r2=523113
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml Tue Mar
27 16:29:26 2007
@@ -148,20 +148,20 @@
Using the Locationmap it is possible to make these files come from
elsewhere.
This is useful if you want to pull files from different directory
structures,
or even remote repositories. For example, the following location match
- will match any request for a document below "remoteDemo" and will
retrieve
+ will match any request for a document below "remote." and will retrieve
the source file from the Apache Forrest SVN repository (directly from
the
ASF's SVN webserver). This
is an ideal way to ensure that your published docs are always
up-to-date.</p>
<source>
- <match pattern="remoteDemo/**.xml">
+ <match pattern="project.remote.**.xml">
<location
src="http://svn.apache.org/repos/asf/forrest/trunk/site-author/content/xdocs/{1}.xml";
/>
</match>
</source>
<p>Note that because this is a wildcard matcher you can request any
page
from the svn server simply by requesting
- <code>/remoteDemo/PATH/TO/FILE/FILENAME.html</code>. In addition, we
+ <code>/remote.PATH/TO/FILE/FILENAME.html</code>. In addition, we
can request any other output format available via Forrest plugins.</p>
<p>When including resources from remote repositories one has to
