Return-Path: 
 <svn-return-1609-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 97481 invoked from network); 23 Feb 2005 00:02:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 23 Feb 2005 00:02:39 -0000
Received: (qmail 38834 invoked by uid 500); 23 Feb 2005 00:02:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 38762 invoked by uid 500); 23 Feb 2005 00:02:38 -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>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 38749 invoked by uid 99); 23 Feb 2005 00:02:38 -0000
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 minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 22 Feb 2005 16:02:38 -0800
Received: (qmail 97347 invoked by uid 65534); 23 Feb 2005 00:02:36 -0000
Message-ID: <20050223000236.97344.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Wed, 23 Feb 2005 00:02:36 -0000
Subject: svn commit: r154917 - in forrest/trunk: docs-author/status.xml
 main/webapp/forrest.xmap main/webapp/menu.xmap main/webapp/tabs.xmap
To: svn@forrest.apache.org
From: cheche@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: cheche
Date: Tue Feb 22 16:02:34 2005
New Revision: 154917

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154917
Log:
I18n uses org.apache.cocoon.matching.LocaleMatcher instead of i18n transfor=
mer.
This requiered that your source must be foo.lang.xml instead of foo_lang.xml


Modified:
    forrest/trunk/docs-author/status.xml
    forrest/trunk/main/webapp/forrest.xmap
    forrest/trunk/main/webapp/menu.xmap
    forrest/trunk/main/webapp/tabs.xmap

Modified: forrest/trunk/docs-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/status.xml?vie=
w=3Ddiff&r1=3D154916&r2=3D154917
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/status.xml (original)
+++ forrest/trunk/docs-author/status.xml Tue Feb 22 16:02:34 2005
@@ -51,6 +51,10 @@
         Added document to facilitate
         <link href=3D"site:upgrading_07">upgrading to v0.7</link>
       </action>
+      <action dev=3D"JJP" type=3D"fix" context=3D"core" fixes-bug=3D"FOR-1=
8" >
+        I18n uses org.apache.cocoon.matching.LocaleMatcher instead of i18n=
 transformer.
+       This requiered that your source must be foo.lang.xml instead of foo=
_lang.xml
+      </action>
       <action dev=3D"RDG" type=3D"add" context=3D"plugins" fixes-bug=3D"FO=
R-445" due-to=3D"Cyriaque Dupoirieux">
         Added proxy.host and proxy.port to allow plugin downloads from beh=
ind a
         proxy.

Modified: forrest/trunk/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/forrest.xmap?v=
iew=3Ddiff&r1=3D154916&r2=3D154917
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/main/webapp/forrest.xmap (original)
+++ forrest/trunk/main/webapp/forrest.xmap Tue Feb 22 16:02:34 2005
@@ -51,7 +51,15 @@
                  =20
     </map:generators>
     <map:serializers default=3D"html"/>
-    <map:matchers default=3D"wildcard"/>
+    <map:matchers default=3D"wildcard">
+    <map:matcher name=3D"i18n" src=3D"org.apache.cocoon.matching.LocaleMat=
cher">
+    <negotiate>true</negotiate>
+    <use-locales>true</use-locales>
+    <use-blank-locale>true</use-blank-locale>
+    <default-locale language=3D"en" country=3D"US"/>
+    </map:matcher>
+    </map:matchers>
+
=20
     <map:transformers default=3D"xslt">
 	   <map:transformer name=3D"pattern"=20
@@ -297,23 +305,49 @@
       <!-- SOURCE FORMATS                                               -->
       <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
=20
-      <map:match pattern=3D"**.xml">
-        <map:select type=3D"config">
-          <map:parameter name=3D"value" value=3D"{defaults:i18n}"/>
-          <map:when test=3D"true">
-          <map:act type=3D"locale">
-            <map:call resource=3D"file-resolver">
-              <map:parameter name=3D"uri" value=3D"{../1}_{language}"/>
-            </map:call>
-          </map:act>
-          </map:when>
-          <map:otherwise>
-            <map:call resource=3D"file-resolver">
-              <map:parameter name=3D"uri" value=3D"{1}"/>
-            </map:call>
-          </map:otherwise>
-        </map:select>
-      </map:match>
+      <map:match type=3D"wildcard" pattern=3D"**.xml">
+       <map:match type=3D"i18n" pattern=3D"{project:content.xdocs}{1}.*.xm=
l">
+          <map:generate src=3D"{source}" />
+          <map:call resource=3D"transform-to-document">
+            <map:parameter name=3D"src" value=3D"{source}" />
+          </map:call>
+          <map:serialize type=3D"xml-document"/>
+       </map:match>
+       <map:match type=3D"i18n" pattern=3D"{project:content.xdocs}{1}.*.ih=
tml">
+         <map:generate src=3D"{source}" type=3D"html" />
+         <map:transform src=3D"{forrest:stylesheets}/html2document.xsl" />
+         <map:transform type=3D"idgen" />
+         <map:serialize type=3D"xml-document"/>
+       </map:match>
+       <map:match type=3D"i18n" pattern=3D"{project:content.xdocs}{1}.*.ht=
ml">
+         <map:generate src=3D"{source}" type=3D"html" />
+         <map:transform src=3D"{forrest:stylesheets}/html2document.xsl" />
+         <map:transform type=3D"idgen" />
+         <map:serialize type=3D"xml-document"/>
+       </map:match>
+       <map:match type=3D"i18n" pattern=3D"{project:content.xdocs}{1}.*.tx=
t">
+         <map:generate type=3D"text2xml" src=3D"{source}" />
+         <map:transform src=3D"{forrest:stylesheets}/text2document.xsl">
+         <map:parameter name=3D"filename" value=3D"{2}" />
+         </map:transform>
+         <map:serialize type=3D"xml-document"/>
+       </map:match>
+       <map:match type=3D"i18n" pattern=3D"{project:content.xdocs}{1}.*.xm=
l">
+          <map:generate src=3D"{source}" />
+          <map:call resource=3D"transform-to-document">
+            <map:parameter name=3D"src" value=3D"{source}" />
+          </map:call>
+          <map:serialize type=3D"xml-document"/>
+       </map:match>
+       <map:select type=3D"exists">
+         <map:when test=3D"{project:temp-dir}/input.xmap">
+             <map:mount uri-prefix=3D""
+                        src=3D"{project:temp-dir}/input.xmap"
+                        check-reload=3D"yes"
+                        pass-through=3D"true"/>
+         </map:when>=20
+       </map:select>
+     </map:match>
      =20
   </map:pipeline>
=20

Modified: forrest/trunk/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/menu.xmap?view=
=3Ddiff&r1=3D154916&r2=3D154917
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/main/webapp/menu.xmap (original)
+++ forrest/trunk/main/webapp/menu.xmap Tue Feb 22 16:02:34 2005
@@ -135,7 +135,7 @@
                 <map:parameter name=3D"locale" value=3D"{defaults:locale}"=
/>
                 <map:parameter name=3D"locale" value=3D"{request-param:loc=
ale}"/>
                 -->
-                <map:parameter name=3D"locale" value=3D"{language}{country=
}{variant}"/>
+                <map:parameter name=3D"locale" value=3D"{lang}{country}{va=
riant}"/>
               </map:transform>
             </map:act>
=20

Modified: forrest/trunk/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/tabs.xmap?view=
=3Ddiff&r1=3D154916&r2=3D154917
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/main/webapp/tabs.xmap (original)
+++ forrest/trunk/main/webapp/tabs.xmap Tue Feb 22 16:02:34 2005
@@ -77,7 +77,7 @@
             <map:act type=3D"locale">
               <map:transform src=3D"{forrest:stylesheets}/i18n.xsl"/>
               <map:transform type=3D"i18n">
-                <map:parameter name=3D"locale" value=3D"{language}{country=
}{variant}"/>
+                <map:parameter name=3D"locale" value=3D"{lang}{country}{va=
riant}"/>
               </map:transform>
             </map:act>
           </map:when>