You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/10 15:19:24 UTC
svn commit: r189954 - in /forrest/branches/locationmap_branch/main:
fresh-site/src/documentation/content/locationmap.xml webapp/linkmap.xmap
webapp/menu.xmap webapp/tabs.xmap
Author: rgardler
Date: Fri Jun 10 06:19:21 2005
New Revision: 189954
URL: http://svn.apache.org/viewcvs?rev=189954&view=rev
Log:
Enable site.xml and tabs.xml to be resolved via the locationmap (thanks to Tim Williams)
Modified:
forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml
forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
forrest/branches/locationmap_branch/main/webapp/menu.xmap
forrest/branches/locationmap_branch/main/webapp/tabs.xmap
Modified: forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml?rev=189954&r1=189953&r2=189954&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml (original)
+++ forrest/branches/locationmap_branch/main/fresh-site/src/documentation/content/locationmap.xml Fri Jun 10 06:19:21 2005
@@ -27,14 +27,31 @@
</components>
<locator>
- <match pattern="rewriteDemo/**">
- <location src="http://www.burrokeet.org/{1}.xml" />
- </match>
- <match pattern="remoteDemo/**.xml">
- <location src="http://svn.apache.org/viewcvs.cgi/*checkout*/forrest/trunk/site-author/content/xdocs/{1}.xml" />
- </match>
- <match pattern="lenya/**.xml">
- <location src="http://lenya.zones.apache.org:8888/default/live/{1}.html?raw=true" />
- </match>
+
+
+ <match pattern="rewriteDemo/**">
+ <location src="http://www.burrokeet.org/{1}.xml" />
+ </match>
+ <match pattern="remoteDemo/**.xml">
+ <location src="http://svn.apache.org/viewcvs.cgi/*checkout*/forrest/trunk/site-author/content/xdocs/{1}.xml" />
+ </match>
+ <match pattern="lenya/**.xml">
+ <location src="http://lenya.zones.apache.org:8888/default/live/{1}.html?raw=true" />
+ </match>
+ <match pattern="tabs.xml">
+ <location src="{project:content.xdocs}tabs.xml"/>
+ <!--<location src="http://127.0.0.1:8080/slide/files/tabs.xml"/>-->
+ </match>
+ <match pattern="site.xml">
+ <location src="{project:content.xdocs}site.xml"/>
+ <!--<location src="http://127.0.0.1:8080/slide/files/site.xml"/>-->
+ </match>
+
+ <!--
+ <match pattern="**.xml">
+ <location src="http://127.0.0.1:8080/slide/files/{1}.xml"/>
+ </match>
+ -->
+
</locator>
</locationmap>
Modified: forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/linkmap.xmap?rev=189954&r1=189953&r2=189954&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/linkmap.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/linkmap.xmap Fri Jun 10 06:19:21 2005
@@ -49,7 +49,14 @@
<!-- site.xml with @href's appended to be context-relative. -->
<map:match pattern="abs-linkmap">
- <map:generate src="{project:content.xdocs}site.xml" />
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}site.xml">
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:when>
+ <map:when test="{lm:site.xml}">
+ <map:generate src="{lm:site.xml}"/>
+ </map:when>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:serialize type="xml" />
Modified: forrest/branches/locationmap_branch/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/menu.xmap?rev=189954&r1=189953&r2=189954&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/menu.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/menu.xmap Fri Jun 10 06:19:21 2005
@@ -61,7 +61,14 @@
<map:pipeline internal-only="false">
<map:match pattern="abs-menulinks">
- <map:generate src="{project:content.xdocs}site.xml" />
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}site.xml">
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:when>
+ <map:when test="{lm:site.xml}">
+ <map:generate src="{lm:site.xml}"/>
+ </map:when>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
@@ -70,7 +77,14 @@
</map:match>
<map:match pattern="**menulinks-*">
- <map:generate src="{project:content.xdocs}site.xml" />
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}site.xml">
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:when>
+ <map:when test="{lm:site.xml}">
+ <map:generate src="{lm:site.xml}"/>
+ </map:when>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
Modified: forrest/branches/locationmap_branch/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/tabs.xmap?rev=189954&r1=189953&r2=189954&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/tabs.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/tabs.xmap Fri Jun 10 06:19:21 2005
@@ -69,7 +69,14 @@
<map:pipelines>
<map:pipeline >
<map:match pattern="**tab-*.html">
- <map:generate src="{project:content.xdocs}tabs.xml"/>
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}tabs.xml">
+ <map:generate src="{project:content.xdocs}tabs.xml"/>
+ </map:when>
+ <map:when test="{lm:tabs.xml}">
+ <map:generate src="{lm:tabs.xml}"/>
+ </map:when>
+ </map:select>
<map:transform type="xinclude"/>
<map:select type="config">
<map:parameter name="value" value="{defaults:i18n}"/>