You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/07/08 00:38:15 UTC
svn commit: r209667 - in /forrest/branches/locationmap_branch/main/webapp:
forrest.xmap linkmap.xmap menu.xmap tabs.xmap
Author: thorsten
Date: Thu Jul 7 15:38:13 2005
New Revision: 209667
URL: http://svn.apache.org/viewcvs?rev=209667&view=rev
Log:
merged changes from locationmap and trunk. resolved by hand.
Modified:
forrest/branches/locationmap_branch/main/webapp/forrest.xmap
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/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/forrest.xmap?rev=209667&r1=209666&r2=209667&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/forrest.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/forrest.xmap Thu Jul 7 15:38:13 2005
@@ -298,7 +298,7 @@
</map:transform>
<map:serialize type="xml-document"/>
</map:match>
- <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.xml">
+ <map:match type="i18n" pattern="{project:content.xdocs}{1}.*.xml">
<map:generate src="{source}" />
<map:call resource="transform-to-document">
<map:parameter name="src" value="{source}" />
Modified: forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/linkmap.xmap?rev=209667&r1=209666&r2=209667&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/linkmap.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/linkmap.xmap Thu Jul 7 15:38:13 2005
@@ -42,7 +42,6 @@
<map:pipeline>
<map:match pattern="linkmap.xml">
-
<map:generate src="cocoon://abs-linkmap" />
<map:transform src="{forrest:stylesheets}/linkmap2document.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=209667&r1=209666&r2=209667&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/menu.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/menu.xmap Thu Jul 7 15:38:13 2005
@@ -153,9 +153,8 @@
<map:transform type="i18n">
<!-- We can use a default locale attribute or Request Parameter
<map:parameter name="locale" value="{defaults:locale}"/>
- <map:parameter name="locale" value="{request-param:locale}"/>
- -->
- <map:parameter name="locale" value="{lang}{country}{variant}"/>
+ <map:parameter name="locale" value="{lang}{country}{variant}"-->
+ <map:parameter name="locale" value="{request:locale}"/>
</map:transform>
</map:act>
Modified: forrest/branches/locationmap_branch/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/tabs.xmap?rev=209667&r1=209666&r2=209667&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/tabs.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/tabs.xmap Thu Jul 7 15:38:13 2005
@@ -87,7 +87,7 @@
<map:act type="locale">
<map:transform src="{forrest:stylesheets}/i18n.xsl"/>
<map:transform type="i18n">
- <map:parameter name="locale" value="{lang}{country}{variant}"/>
+ <map:parameter name="locale" value="{request:locale}"/>
</map:transform>
</map:act>
</map:when>