forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Williams <william...@gmail.com>
Subject Re: [headsup] Merging locationmap_branch to head
Date Tue, 05 Jul 2005 21:51:55 GMT
On 7/5/05, Thorsten Scherler <thorsten@apache.org> wrote:
> Hello devs,
> 
> I merged the view related stuff from locationmap_branch to head. Now I
> was up to do the same for the whole locationmap.
> 
> I tested like
> 22:39:54 thorsten@cartman>/guada/home/thorsten/apache/forrest-trunk $
> svn merge --dry-run -r190293:head
> https://svn.apache.org/repos/asf/forrest/branches/locationmap_branch/
> 
> Besides the following files everything went well:
> C  main/webapp/forrest.xmap
> C  main/webapp/tabs.xmap
> C  main/webapp/linkmap.xmap
> C  main/webapp/menu.xmap
> 
> Now I did a small diff [t]-trunk/[l]-locationmap in my eclipse and found
> following differences. Some need IMO discussion.
> 
> 1) C  main/webapp/forrest.xmap
> In the locationmap are the <map:call resource=""/> and the @type="i18n"
> from the match missing. Is this intended?
> [t]
> <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}" />
>           </map:call>
>           <map:serialize type="xml-document"/>
> [l]
> <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"/>
> 
> 2) C  main/webapp/tabs.xmap
> Here we have again i18n differences.
> [t]
>      <map:transform type="i18n">
>                 <map:parameter name="locale" value="{request:locale}"/>
>               </map:transform>
> 
> [l]
>      <map:transform type="i18n">
>                 <map:parameter name="locale"
> value="{lang}{country}{variant}"/>
>               </map:transform>
> 
> 
> 3) C  main/webapp/linkmap.xmap
> exchanges only the generator.
> 
> 4) C  main/webapp/menu.xmap
> Again i18n
> 
> [t]
>    <map:parameter name="locale" value="{request-param:locale}"/>
> 
> [l]
>    <map:parameter name="locale" value="{lang}{country}{variant}"/>
> 
> WDYT?

1 - maybe a goof?

2 & 4 - any chance that the trunk has changed since we branched?  I
don't recall anyone  messing with either of these in the lm branch.

3 - I don't understand.  It should have added the lm exists and then
fall back to the project.xdocs location.

--tim

Mime
View raw message