Return-Path: 
 <svn-return-3796-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 1295 invoked from network); 3 Oct 2005 17:43:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 3 Oct 2005 17:43:17 -0000
Received: (qmail 7053 invoked by uid 500); 3 Oct 2005 17:43:17 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 6959 invoked by uid 500); 3 Oct 2005 17:43:15 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 6947 invoked by uid 99); 3 Oct 2005 17:43:15 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2005 10:43:15 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 03 Oct 2005 10:43:20 -0700
Received: (qmail 1242 invoked by uid 65534); 3 Oct 2005 17:42:54 -0000
Message-ID: <20051003174254.1241.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r293408 - in /forrest/trunk/main/webapp: forrest.xmap
 i18n.xmap
 locationmap.xml menu.xmap resources/stylesheets/book2book-i18n.xsl
 resources/stylesheets/i18n.xsl
Date: Mon, 03 Oct 2005 17:42:53 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Mon Oct  3 10:42:40 2005
New Revision: 293408

URL: http://svn.apache.org/viewcvs?rev=293408&view=rev
Log:
use locationmap for forrest.xmap, i18n.xmap and menu.xmap (FOR-686, FOR-687, FOR-690)

Added:
    forrest/trunk/main/webapp/resources/stylesheets/book2book-i18n.xsl
      - copied unchanged from r293085, forrest/trunk/main/webapp/resources/stylesheets/i18n.xsl
Removed:
    forrest/trunk/main/webapp/resources/stylesheets/i18n.xsl
Modified:
    forrest/trunk/main/webapp/forrest.xmap
    forrest/trunk/main/webapp/i18n.xmap
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/menu.xmap

Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/forrest.xmap?rev=293408&r1=293407&r2=293408&view=diff
==============================================================================
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Mon Oct  3 10:42:40 2005
@@ -264,14 +264,7 @@
        </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="{lm:project.{0}}"/>
-           </map:otherwise>
-         </map:select>
+         <map:generate src="{lm:project.{0}}"/>
          <map:serialize type="xml"/>
        </map:match>
      </map:match>

Modified: forrest/trunk/main/webapp/i18n.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/i18n.xmap?rev=293408&r1=293407&r2=293408&view=diff
==============================================================================
--- forrest/trunk/main/webapp/i18n.xmap (original)
+++ forrest/trunk/main/webapp/i18n.xmap Mon Oct  3 10:42:40 2005
@@ -29,8 +29,8 @@
     <map:transformers default="xslt">
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="languages">
-          <catalogue id="languages" name="languages" location="{project:translations}"/>
-          <catalogue id="langcode" name="langcode" location="{project:translations}"/>
+          <catalogue id="languages" name="languages" location="{lm:project.translations}"/>
+          <catalogue id="langcode" name="langcode" location="{lm:project.translations}"/>
         </catalogues>
       </map:transformer>
     </map:transformers>
@@ -48,7 +48,7 @@
         <map:parameter name="include" value="^{2}" />
         <map:parameter name="exclude" value="^{2}\.|{2}.{../language}" />
       </map:generate>
-      <map:transform src="{forrest:stylesheets}/directory2i18n.xsl">
+      <map:transform src="{lm:directory.i18n}">
         <map:parameter name="ext"    value="{3}" />
       </map:transform>
       <map:transform type="i18n">

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=293408&r1=293407&r2=293408&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Mon Oct  3 10:42:40 2005
@@ -69,6 +69,26 @@
       <location src="{forrest:stylesheets}/strip-doctype.xsl" />
     </match>
     
+    <match pattern="transform.linkmap.linkmap-absolutized">
+      <location src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-normalizedtabs">
+      <location src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
+    </match>
+    
+    <match pattern="transform.xml.xml-normalizedhrefs">
+      <location src="{forrest:stylesheets}/normalizehrefs.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-selectnode">
+      <location src="{forrest:stylesheets}/site2site-selectnode.xsl" />
+    </match>
+    
+    <match pattern="transform.linkmap.linkmap-relativized">
+      <location src="{forrest:stylesheets}/relativize-linkmap.xsl" />
+    </match>
+    
     <!--
       FIXME: strip remaining i18n elements and attributes.
       workaround for http://issues.apache.org/jira/browse/FOR-592
@@ -95,12 +115,11 @@
       <location src="{forrest:stylesheets}/aggregates/{1}2{2}.xsl" />
     </match>
     
-    <match pattern="lm:transform-aggregate.linkmap.relativized-linkmap">
+    <match pattern="transform-aggregate.linkmap.relativized-linkmap">
       <location src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl" />
     </match>
     
     <!-- All core other transforms -->
-    
     <match pattern="transform.*.*">
       <select>
         <location src="{project:skins-dir}{forrest:skin}/xslt/html/{1}2{2}.xsl" />
@@ -110,6 +129,13 @@
     </match>
     
     <!-- ================================== -->
+    <!-- i18n files                         -->
+    <!-- ================================== -->
+    <match pattern="project.translations">
+        <location src="{project:translations}" />
+    </match>
+    
+    <!-- ================================== -->
     <!-- skinconf files                     -->
     <!-- ================================== -->
     <match pattern="project.skinconf">
@@ -184,6 +210,10 @@
     
     <match pattern="project.build-info">
       <location src="{project:temp-dir}/build-info.xml" />
+    </match>
+    
+    <match pattern="project.xml.site">
+      <location src="{project:content.xdocs}site.xml" />
     </match>
     
     <match pattern="project.**">

Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/menu.xmap?rev=293408&r1=293407&r2=293408&view=diff
==============================================================================
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Mon Oct  3 10:42:40 2005
@@ -61,46 +61,24 @@
 
     <map:pipeline internal-only="false">
       <map:match pattern="abs-menulinks">
-			  <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:generate src="{lm:project.xml.site}"/>
         <map:transform type="xinclude"/>
-        <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
-        <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
-        <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/>
+        <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
+        <map:transform src="{lm:transform.linkmap.linkmap-normalizedtabs}" />
+        <map:transform src="{lm:transform.xml.xml-normalizedhrefs}"/>
         <map:serialize type="xml"/>
       </map:match>
 
       <map:match pattern="**menulinks-*">
-        <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:generate src="{lm:project.xml.site}"/>
         <map:transform type="xinclude"/>
-        <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
-
+        <map:transform src="{lm:transform.linkmap.linkmap-absolutized}" />
         <map:select type="config">
           <map:parameter name="value" value="{defaults:menu-scheme}"/>
-
           <map:when test="tab_attributes">
-            <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
-            <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/>
-            <map:transform src="{forrest:stylesheets}/site2site-selectnode.xsl">
+            <map:transform src="{lm:transform.linkmap.linkmap-normalizedtabs}" />
+            <map:transform src="{lm:transform.xml.xml-normalizedhrefs}"/>
+            <map:transform src="{lm:transform.linkmap.linkmap-selectnode}">
               <map:parameter name="path" value="{1}{2}"/>
             </map:transform>
           </map:when>
@@ -113,7 +91,7 @@
 
           </map:select>
 
-        <map:transform src="{forrest:stylesheets}/relativize-linkmap.xsl">
+        <map:transform src="{lm:transform.linkmap.linkmap-relativized}">
           <map:parameter name="path" value="{1}{2}" />
         </map:transform>
         <map:serialize type="xml" />
@@ -129,17 +107,17 @@
 
         <map:select type="exists">
 
-          <map:when test="{project:content.xdocs}{1}book.xml">
+          <map:when test="{lm:project.{1}book.xml}">
             <!-- If a hand-created book.xml exists, use it -->
-            <map:parameter name="url" value="{project:content.xdocs}{1}book.xml" />
-            <map:generate src="{project:content.xdocs}{1}book.xml" />
+            <map:parameter name="url" value="{lm:project.{1}book.xml}" />
+            <map:generate src="{lm:project.{1}book.xml}" />
           </map:when>
 
           <map:otherwise>
             <!-- If no book.xml, generate it from the linkmap. -->
             <map:generate src="cocoon:/{1}menulinks-{2}" />
             <!-- The above generates the subset of the linkmap relevant to our directory. -->
-            <map:transform src="{forrest:stylesheets}/site2book.xsl" />
+            <map:transform src="{lm:transform.site.book}" />
           </map:otherwise>
 
         </map:select>
@@ -149,7 +127,7 @@
           <map:when test="true">
 
             <map:act type="locale">
-              <map:transform src="{forrest:stylesheets}/i18n.xsl"/>
+              <map:transform src="{lm:transform.book.book-i18n}"/>
               <map:transform type="i18n">
                 <!-- We can use a default locale attribute or Request Parameter
                 <map:parameter name="locale" value="{defaults:locale}"/>