Return-Path: 
 <svn-return-2767-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 14994 invoked from network); 15 Jun 2005 20:53:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Jun 2005 20:53:58 -0000
Received: (qmail 59365 invoked by uid 500); 15 Jun 2005 20:53:57 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 59272 invoked by uid 500); 15 Jun 2005 20:53:56 -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 59259 invoked by uid 99); 15 Jun 2005 20:53:56 -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; Wed, 15 Jun 2005 13:53:51 -0700
Received: (qmail 95734 invoked by uid 65534); 15 Jun 2005 19:53:40 -0000
Message-ID: <20050615195340.95733.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r190796 - in /forrest/trunk:
 main/fresh-site/forrest.properties
 main/webapp/sitemap.xmap site-author/status.xml
Date: Wed, 15 Jun 2005 19:53:39 -0000
To: svn@forrest.apache.org
From: cheche@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cheche
Date: Wed Jun 15 12:53:39 2005
New Revision: 190796

URL: http://svn.apache.org/viewcvs?rev=3D190796&view=3Drev
Log:
Add a config selector so the i18n transformer only works whrn i18n is true

Modified:
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.pr=
operties?rev=3D190796&r1=3D190795&r2=3D190796&view=3Ddiff
=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/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Wed Jun 15 12:53:39 20=
05
@@ -109,8 +109,9 @@
 # The issues list as rss
 #project.issues-rss-url=3D
=20
-#I18n Property. If you want to use it for static site then make sure that
-# you have $LANG set on your enviroment
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
 #project.i18n=3Dtrue
=20
 # The names of plugins that are required to build the project

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?r=
ev=3D190796&r1=3D190795&r2=3D190796&view=3Ddiff
=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/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Wed Jun 15 12:53:39 2005
@@ -130,7 +130,7 @@
    </map:transformer>
    <map:transformer name=3D"i18n" src=3D"org.apache.cocoon.transformation.=
I18nTransformer">
     <catalogues default=3D"common">
-      <catalogue id=3D"common" name=3D"CommonMessages" location=3D"skins/c=
ommon/messages"/>
+      <catalogue id=3D"common" name=3D"CommonMessages" location=3D"skins/c=
ommon/translations"/>
     </catalogues>
     <cache-at-startup>true</cache-at-startup>
   </map:transformer>
@@ -179,12 +179,15 @@
     </map:matchers>
=20
     <map:selectors>
-      <map:selector logger=3D"sitemap.selector.exists" name=3D"exists" src=
=3D"org.apache.forrest.sourceexists.SourceExistsSelector" />
-   <map:selector logger=3D"sitemap.selector.exception" name=3D"exception"
-                 src=3D"org.apache.cocoon.selection.ExceptionSelector">
-     <exception name=3D"syntax" class=3D"net.sourceforge.chaperon.process.=
ParseException"/>
-     <exception class=3D"java.lang.Throwable" unroll=3D"true"/>
-   </map:selector>
+      <map:selector name=3D"exists" logger=3D"sitemap.selector.exists" =20
+                    src=3D"org.apache.forrest.sourceexists.SourceExistsSel=
ector" />
+      <map:selector name=3D"exception" logger=3D"sitemap.selector.exceptio=
n"=20
+                    src=3D"org.apache.cocoon.selection.ExceptionSelector">
+       <exception name=3D"syntax" class=3D"net.sourceforge.chaperon.proces=
s=2EParseException"/>
+       <exception class=3D"java.lang.Throwable" unroll=3D"true"/>
+     </map:selector>
+     <map:selector name=3D"config" logger=3D"sitemap.selector.config"=20
+                   src=3D"org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
=20
     <map:pipes default=3D"caching">
@@ -233,9 +236,14 @@
             </map:transform>
           </map:otherwise>
         </map:select>
-        <map:transform type=3D"i18n">
-          <map:parameter name=3D"locale" value=3D"{request:locale}"/>
-        </map:transform>
+        <map:select type=3D"config">
+          <map:parameter name=3D"value" value=3D"{defaults:i18n}"/>
+          <map:when test=3D"true">=09
+            <map:transform type=3D"i18n">
+              <map:parameter name=3D"locale" value=3D"{request:locale}"/>
+            </map:transform>
+	  </map:when>
+        </map:select>
       <!--
         FIXME: strip_namespace is because this bug: http://issues.apache.o=
rg/bugzilla/show_bug.cgi?id=3D35348
       -->

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=
=3D190796&r1=3D190795&r2=3D190796&view=3Ddiff
=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/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Jun 15 12:53:39 2005
@@ -55,7 +55,8 @@
   <changes>
     <release version=3D"0.8-dev" date=3D"not yet released">
       <notes>
-        <p>Apache Forrest is pleased to release the new version: apache-fo=
rrest-0.7</p>
+        <section>
+        <title>Apache Forrest is pleased to release the new version: apach=
e-forrest-0.7</title>
        =20
         <p>It can be downloaded from one of the <link href=3D"http://forre=
st.apache.org/mirrors.cgi">Apache
         Software Foundation mirror sites</link>.</p>
@@ -67,7 +68,7 @@
         standards, which separates presentation from content.
         Forrest can generate static documents, or be used as a
         dynamic server, or be deployed by its automated facility.</p>
-       =20
+        </section>
         <section>
           <title>Requirements</title>
=20
@@ -121,7 +122,6 @@
           <p>Feedback, feature suggestions, bugs and any other issues can =
be discussed on
           our <link href=3D"http://forrest.apache.org/mail-lists.html">mai=
ling lists</link>.</p>
         </section>
-       =20
       </notes>
      =20
     </release>
@@ -131,6 +131,10 @@
         Added document to facilitate
         <link href=3D"site:v0.70//upgrading_07">upgrading to v0.7</link>
       </action>
+      <action context=3D"code" type=3D"update" dev=3D"JJP"fixes-bug=3D"FOR=
-18">
+          Config check for the i8n attribute for i18n transformer
+	  so it used only when necesary.
+       </action>
       <action dev=3D"DC" type=3D"update" context=3D"code" importance=3D"hi=
gh">
         Enhanced the Message of the Day (MOTD) facility.
         See skinconf.xml from a "seed" site for configuration details.