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:36:56 UTC
svn commit: r209666 - in /forrest/trunk/main/webapp: forrest.xmap
linkmap.xmap menu.xmap tabs.xmap
Author: thorsten
Date: Thu Jul 7 15:36:53 2005
New Revision: 209666
URL: http://svn.apache.org/viewcvs?rev=209666&view=rev
Log:
merged changes from locationmap and trunk. resolved by hand.
Modified:
forrest/trunk/main/webapp/forrest.xmap
forrest/trunk/main/webapp/linkmap.xmap
forrest/trunk/main/webapp/menu.xmap
forrest/trunk/main/webapp/tabs.xmap
Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/forrest.xmap?rev=209666&r1=209665&r2=209666&view=diff
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Thu Jul 7 15:36:53 2005
@@ -305,6 +305,18 @@
</map:call>
<map:serialize type="xml-document"/>
</map:match>
+
+ <map:match pattern="**.xml">
+ <map:select type="exists">
+ <map:when test="{lm:{0}}">
+ <map:generate src="{lm:{0}}"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="{project:content.xdocs}{0}"/>
+ </map:otherwise>
+ </map:select>
+ <map:serialize type="xml"/>
+ </map:match>
</map:match>
</map:pipeline>
Modified: forrest/trunk/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/linkmap.xmap?rev=209666&r1=209665&r2=209666&view=diff
==============================================================================
--- forrest/trunk/main/webapp/linkmap.xmap (original)
+++ forrest/trunk/main/webapp/linkmap.xmap Thu Jul 7 15:36:53 2005
@@ -49,7 +49,17 @@
<!-- 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:otherwise>
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:otherwise>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:serialize type="xml" />
Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/menu.xmap?rev=209666&r1=209665&r2=209666&view=diff
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Thu Jul 7 15:36:53 2005
@@ -61,7 +61,17 @@
<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:otherwise>
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:otherwise>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
@@ -70,7 +80,17 @@
</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:otherwise>
+ <map:generate src="{project:content.xdocs}site.xml"/>
+ </map:otherwise>
+ </map:select>
<map:transform type="xinclude"/>
<map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
Modified: forrest/trunk/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/tabs.xmap?rev=209666&r1=209665&r2=209666&view=diff
==============================================================================
--- forrest/trunk/main/webapp/tabs.xmap (original)
+++ forrest/trunk/main/webapp/tabs.xmap Thu Jul 7 15:36:53 2005
@@ -69,7 +69,17 @@
<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:otherwise>
+ <map:generate src="{project:content.xdocs}tabs.xml"/>
+ </map:otherwise>
+ </map:select>
<map:transform type="xinclude"/>
<map:select type="config">
<map:parameter name="value" value="{defaults:i18n}"/>
Re: svn commit: r209666 - in /forrest/trunk/main/webapp:
forrest.xmap linkmap.xmap menu.xmap tabs.xmap
Posted by Thorsten Scherler <th...@apache.org>.
On Fri, 2005-07-08 at 00:14 +0100, Ross Gardler wrote:
> thorsten@apache.org wrote:
> > Author: thorsten
> > Date: Thu Jul 7 15:36:53 2005
> > New Revision: 209666
> >
> > URL: http://svn.apache.org/viewcvs?rev=209666&view=rev
> > Log:
> > merged changes from locationmap and trunk. resolved by hand.
>
>
> You had to do this by hand? Have you and idea what was causing the problem?
>
Actually yes and no.
My guess: it was a combination of formating diffs and changes to the
i18n stuff which let svn gave up on seeing a way to merge it.
> (thanks for taking the time)
>
:)
Was quite quick on the end because I knew what I had to change. ;-)
> Ross
>
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
Re: svn commit: r209666 - in /forrest/trunk/main/webapp: forrest.xmap
linkmap.xmap menu.xmap tabs.xmap
Posted by Ross Gardler <rg...@apache.org>.
thorsten@apache.org wrote:
> Author: thorsten
> Date: Thu Jul 7 15:36:53 2005
> New Revision: 209666
>
> URL: http://svn.apache.org/viewcvs?rev=209666&view=rev
> Log:
> merged changes from locationmap and trunk. resolved by hand.
You had to do this by hand? Have you and idea what was causing the problem?
(thanks for taking the time)
Ross