Return-Path: 
 <svn-return-7812-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 53954 invoked from network); 3 Sep 2008 05:36:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Sep 2008 05:36:52 -0000
Received: (qmail 5466 invoked by uid 500); 3 Sep 2008 05:36:50 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 5432 invoked by uid 500); 3 Sep 2008 05:36:50 -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 5423 invoked by uid 99); 3 Sep 2008 05:36:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 22:36:50 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 05:36:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6FCF0238899E; Tue,  2 Sep 2008 22:36:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r691518 -
 /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
Date: Wed, 03 Sep 2008 05:35:59 -0000
To: svn@forrest.apache.org
From: sjur@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080903053600.6FCF0238899E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sjur
Date: Tue Sep  2 22:35:58 2008
New Revision: 691518

URL: http://svn.apache.org/viewvc?rev=691518&view=rev
Log:
Added i18n matching to the source file lookup, thus allowing l10n of page content for wiki-format pages:

somedoc.en.jspwiki
somedoc.es.jspwiki
etc

can be used to serve localised content using the simple markup format of wikis.

Also added some comments.

We have used this setup for jspwiki for months at our site, so should work without problems. But it is not tested for the other wiki formats.

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=691518&r1=691517&r2=691518&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Tue Sep  2 22:35:58 2008
@@ -35,57 +35,68 @@
   <map:resources>
     <map:resource name="file-resolver">
       <map:select type="exists">
+        <!-- Moinwiki Markup -->
         <map:when test="{lm:project.{uri}.moinwiki}">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
-            <map:generate type="text2xml" src="{lm:project.{1}{2}.moinwiki}" />
+            <map:match type="i18n" pattern="{lm:project.{1}{2}.*.moinwiki}">
+            <map:generate type="text2xml" src="{source}" />
             <map:transform type="lexer"   src="cocoon:/moinwiki.xlex"/>
             <map:transform type="parser"  src="cocoon:/moinwiki.xgrm"/>
             <map:transform type="xsltc" 
               src="{lm:wiki.transform.moinwiki.xdoc}">
-              <map:parameter name="name" value="{2}" />
+              <map:parameter name="name" value="{../2}" />
               <map:parameter name="spaceless-filenames" value="true"/>
             </map:transform>
             <map:serialize type="xml-document"/>
+            </map:match>
           </map:match>
         </map:when>
+        <!-- JSPWiki Markup -->
         <map:when test="{lm:project.{uri}.jspwiki}">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
-            <map:generate type="text2xml" src="{lm:project.{1}{2}.jspwiki}" />
+            <map:match type="i18n" pattern="{lm:project.{1}{2}.*.jspwiki}">
+            <map:generate type="text2xml" src="{source}" />
             <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
             <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
             <map:transform type="xsltc" 
               src="{lm:wiki.transform.wiki.xdoc}">
-              <map:parameter name="name" value="{2}" />
+              <map:parameter name="name" value="{../2}" />
               <map:parameter name="spaceless-filenames" value="true"/>
             </map:transform>
             <map:serialize type="xml-document"/>
+            </map:match>
           </map:match>
         </map:when>
+        <!-- CWiki Markup -->
         <map:when test="{lm:project.{uri}.cwiki}">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
-            <map:generate type="text2xml" src="{lm:project.{1}{2}.cwiki}" />
+            <map:match type="i18n" pattern="{lm:project.{1}{2}.*.cwiki}">
+            <map:generate type="text2xml" src="{source}" />
             <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
             <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
             <map:transform type="xsltc" 
               src="{lm:wiki.transform.wiki.xdoc}">
-              <map:parameter name="name" value="{2}" />
+              <map:parameter name="name" value="{../2}" />
               <map:parameter name="spaceless-filenames" value="true"/>
             </map:transform>
             <map:serialize type="xml-document"/>
+            </map:match>
           </map:match>
         </map:when>
         <!-- Google Code Wiki Markup -->
         <map:when test="{lm:project.{uri}.wiki}">
           <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
-            <map:generate type="text2xml" src="{lm:project.{1}{2}.wiki}" />
+            <map:match type="i18n" pattern="{lm:project.{1}{2}.*.wiki}">
+            <map:generate type="text2xml" src="{source}" />
             <map:transform type="lexer"   src="cocoon:/googlewiki.xlex"/>
             <map:transform type="parser"  src="cocoon:/googlewiki.xgrm"/>
             <map:transform type="xsltc" 
               src="{lm:wiki.transform.googlewiki.xdoc}">
-              <map:parameter name="name" value="{2}" />
+              <map:parameter name="name" value="{../2}" />
               <map:parameter name="spaceless-filenames" value="true"/>
             </map:transform>
             <map:serialize type="xml-document"/>
+            </map:match>
           </map:match>
         </map:when>
       </map:select>