Return-Path: 
 <jspwiki-commits-return-641-apmail-incubator-jspwiki-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org
Received: (qmail 58091 invoked from network); 29 Jun 2008 15:47:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Jun 2008 15:47:42 -0000
Received: (qmail 46882 invoked by uid 500); 29 Jun 2008 15:47:43 -0000
Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org
Received: (qmail 46867 invoked by uid 500); 29 Jun 2008 15:47:43 -0000
Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jspwiki-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jspwiki-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jspwiki-commits@incubator.apache.org>
List-Id: <jspwiki-commits.incubator.apache.org>
Reply-To: jspwiki-dev@incubator.apache.org
Delivered-To: mailing list jspwiki-commits@incubator.apache.org
Received: (qmail 46858 invoked by uid 99); 29 Jun 2008 15:47:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jun 2008 08:47:43 -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; Sun, 29 Jun 2008 15:46:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 448E523889FA; Sun, 29 Jun 2008 08:47:14 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r672632 - in /incubator/jspwiki/trunk: ./ .settings/
 src/wikipages/ src/wikipages/en/ src/wikipages/fi/
Date: Sun, 29 Jun 2008 15:47:13 -0000
To: jspwiki-commits@incubator.apache.org
From: jalkanen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080629154714.448E523889FA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jalkanen
Date: Sun Jun 29 08:47:12 2008
New Revision: 672632

URL: http://svn.apache.org/viewvc?rev=672632&view=rev
Log:
Created new subdirectories under wikipages for each language we want to support, and tweaked build process so that it can create a separate corepages.zip for each language.

Added:
    incubator/jspwiki/trunk/src/wikipages/en/
    incubator/jspwiki/trunk/src/wikipages/en/About.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/About.txt
    incubator/jspwiki/trunk/src/wikipages/en/ApprovalRequiredForPageChanges.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
    incubator/jspwiki/trunk/src/wikipages/en/ApprovalRequiredForUserProfiles.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
    incubator/jspwiki/trunk/src/wikipages/en/Community.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/Community.txt
    incubator/jspwiki/trunk/src/wikipages/en/CopyrightNotice.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt
    incubator/jspwiki/trunk/src/wikipages/en/EditFindAndReplaceHelp.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/EditFindAndReplaceHelp.txt
    incubator/jspwiki/trunk/src/wikipages/en/EditPageHelp.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/EditPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/FullRecentChanges.txt
    incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt
    incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/LeftMenuFooter.txt
    incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/LoginHelp.txt
    incubator/jspwiki/trunk/src/wikipages/en/LoginPageHelp.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/LoginPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/en/Main.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/Main.txt
    incubator/jspwiki/trunk/src/wikipages/en/MoreMenu.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/MoreMenu.txt
    incubator/jspwiki/trunk/src/wikipages/en/OneMinuteWiki.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/OneMinuteWiki.txt
    incubator/jspwiki/trunk/src/wikipages/en/PageAlias.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/PageAlias.txt
    incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/PageIndex.txt
    incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/RecentChanges.txt
    incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/RejectedMessage.txt
    incubator/jspwiki/trunk/src/wikipages/en/SandBox.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/SandBox.txt
    incubator/jspwiki/trunk/src/wikipages/en/SearchPageHelp.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/SearchPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/en/SystemInfo.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/SystemInfo.txt
    incubator/jspwiki/trunk/src/wikipages/en/TextFormattingRules.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/TextFormattingRules.txt
    incubator/jspwiki/trunk/src/wikipages/en/TitleBox.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/TitleBox.txt
    incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/UndefinedPages.txt
    incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/UnusedPages.txt
    incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/WikiEtiquette.txt
    incubator/jspwiki/trunk/src/wikipages/en/WikiName.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/WikiName.txt
    incubator/jspwiki/trunk/src/wikipages/en/WikiWiki.txt
      - copied unchanged from r672580, incubator/jspwiki/trunk/src/wikipages/WikiWiki.txt
    incubator/jspwiki/trunk/src/wikipages/fi/
    incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt   (with props)
    incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt   (with props)
    incubator/jspwiki/trunk/src/wikipages/fi/EditFindAndReplaceHelp.txt
    incubator/jspwiki/trunk/src/wikipages/fi/MoreMenu.txt
    incubator/jspwiki/trunk/src/wikipages/fi/TitleBox.txt
Removed:
    incubator/jspwiki/trunk/src/wikipages/About.txt
    incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
    incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
    incubator/jspwiki/trunk/src/wikipages/Community.txt
    incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt
    incubator/jspwiki/trunk/src/wikipages/EditFindAndReplaceHelp.txt
    incubator/jspwiki/trunk/src/wikipages/EditPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/FullRecentChanges.txt
    incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt
    incubator/jspwiki/trunk/src/wikipages/LeftMenu.txt
    incubator/jspwiki/trunk/src/wikipages/LeftMenuFooter.txt
    incubator/jspwiki/trunk/src/wikipages/LoginHelp.txt
    incubator/jspwiki/trunk/src/wikipages/LoginPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/Main.txt
    incubator/jspwiki/trunk/src/wikipages/MoreMenu.txt
    incubator/jspwiki/trunk/src/wikipages/OneMinuteWiki.txt
    incubator/jspwiki/trunk/src/wikipages/PageAlias.txt
    incubator/jspwiki/trunk/src/wikipages/PageIndex.txt
    incubator/jspwiki/trunk/src/wikipages/RecentChanges.txt
    incubator/jspwiki/trunk/src/wikipages/RejectedMessage.txt
    incubator/jspwiki/trunk/src/wikipages/SandBox.txt
    incubator/jspwiki/trunk/src/wikipages/SearchPageHelp.txt
    incubator/jspwiki/trunk/src/wikipages/SystemInfo.txt
    incubator/jspwiki/trunk/src/wikipages/TextFormattingRules.txt
    incubator/jspwiki/trunk/src/wikipages/TitleBox.txt
    incubator/jspwiki/trunk/src/wikipages/UndefinedPages.txt
    incubator/jspwiki/trunk/src/wikipages/UnusedPages.txt
    incubator/jspwiki/trunk/src/wikipages/WikiEtiquette.txt
    incubator/jspwiki/trunk/src/wikipages/WikiName.txt
    incubator/jspwiki/trunk/src/wikipages/WikiWiki.txt
Modified:
    incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/src/wikipages/.corepages

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs?rev=672632&r1=672631&r2=672632&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.core.resources.prefs Sun Jun 29 08:47:12 2008
@@ -1,4 +1,9 @@
-#Sun Jun 22 16:08:18 EEST 2008
+#Sun Jun 29 18:40:26 EEST 2008
 eclipse.preferences.version=1
 encoding//etc/i18n/templates/default_de.properties=ISO-8859-1
+encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8
+encoding//src/wikipages/fi/ApprovalRequiredForUserProfiles.txt=UTF-8
+encoding//src/wikipages/fi/EditFindAndReplaceHelp.txt=UTF-8
+encoding//src/wikipages/fi/MoreMenu.txt=UTF-8
+encoding//src/wikipages/fi/TitleBox.txt=UTF-8
 encoding/<project>=ISO-8859-1

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=672632&r1=672631&r2=672632&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 29 08:47:12 2008
@@ -1,3 +1,10 @@
+2008-06-29  Janne Jalkanen <jalkanen@apache.org>
+
+        * Moved all pages from wikipages under wikipages/en, and
+        tweaked the build process accordingly.  Also created a basic
+        Finnish translation of the CorePages.  The build process
+        now creates jspwiki_corepages_en.zip and _fi.zip.
+
 2008-06-19  Janne Jalkanen <jalkanen@apache.org>
 
         * 2.7.0-svn-51

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=672632&r1=672631&r2=672632&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Jun 29 08:47:12 2008
@@ -504,19 +504,27 @@
        whether a page is a core page or not is found in src/wikipages/.corepages -->
 
   <target name="corepageszip" depends="installinit">
-    <zip zipfile="${install.fulldir}/${ant.project.name}-corepages.zip"
-         basedir="src/wikipages" includesfile="src/wikipages/.corepages">
+    <zip zipfile="${install.fulldir}/${ant.project.name}-corepages_en.zip"
+         basedir="src/wikipages/en" includesfile="src/wikipages/.corepages">
     </zip>
+  
+    <zip zipfile="${install.fulldir}/${ant.project.name}-corepages_fi.zip"
+         basedir="src/wikipages/fi" includesfile="src/wikipages/.corepages">
+    </zip>
+
+    <!-- Add other languages here -->
+    
   </target>
 
-  <!-- Creates a full ZIP file of all document files -->
+  <!-- Creates a full ZIP file of all document files, ignoring any resources
+       which start with a dot. -->
 
   <target name="documentzip" depends="installinit,javadoc"
           description="Creates JSPWiki documentation zipfile">
 
     <zip zipfile="${install.fulldir}/${ant.project.name}-doc.zip">
         <zipfileset dir="doc" prefix="doc" />
-        <zipfileset dir="src/wikipages" prefix="doc/wikipages" />
+        <zipfileset dir="src/wikipages" prefix="doc/wikipages" excludes="**/.??*"/>
     </zip>
   </target>
 
@@ -770,7 +778,7 @@
       <!-- Create a wiki page directory and point jspwiki.properties to it -->
       <mkdir dir="@{context.dir}/wikipages" />
       <copy toDir="@{context.dir}/wikipages" flatten="true" >
-        <fileset dir="src/wikipages">
+        <fileset dir="src/wikipages/en">
           <include name="Main.*" />
           <include name="LeftMenu*.*" />
           <include name="About.*" />

Modified: incubator/jspwiki/trunk/src/wikipages/.corepages
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/.corepages?rev=672632&r1=672631&r2=672632&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt?rev=672632&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt Sun Jun 29 08:47:12 2008
@@ -0,0 +1,5 @@
+Muokkauksesi vaatii hyväksynnän.  Pyyntö on välitetty eteenpäin sivujen ylläpitäjälle, ja he
+joko hylkäävät tai hyväksyvät muokkauksesi.
+
+Voit tarkistaa pyyntösi tilan kirjautumalla sisään (jos et jo ole) ja klikkaamalla "Työsarjat"
+-linkkiä.

Propchange: incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForPageChanges.txt
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt?rev=672632&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt Sun Jun 29 08:47:12 2008
@@ -0,0 +1,6 @@
+Uusien profiilien luonti vaatii ylläpidon hyväksynnän.  Pyyntösi on siirretty eteenpäin
+hyväksyttäväksi.
+
+Jos annoit sähköpostiosoitteesi, joku wikin ylläpitäjistä lähettänee sinulle sähköpostia
+kun tilisi on hyväksytty.  Muussa tapauksessa saatat ehkä haluta kokeilla myöhemmin, josko
+tämä jo toimisi.

Propchange: incubator/jspwiki/trunk/src/wikipages/fi/ApprovalRequiredForUserProfiles.txt
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jspwiki/trunk/src/wikipages/fi/EditFindAndReplaceHelp.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fi/EditFindAndReplaceHelp.txt?rev=672632&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fi/EditFindAndReplaceHelp.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/fi/EditFindAndReplaceHelp.txt Sun Jun 29 08:47:12 2008
@@ -0,0 +1,28 @@
+JSPWiki tukee niin kutsuttuja säännöllisiä lausekkeita (regexp). Etsiessäsi voit siis käyttää seuraavia 
+apumerkkejä:
+
+|.      |mikä tahansa merkki paitsi rivinvaihto  |+      |yhden tai useampia kertoja
+|*      |nolla tai useampia kertoja              |?      |nolla tai ei yhtään kertaa
+|{n}    |tasan n kertaa                          |{n,m}  |vähintään n, enintään m kertaa
+|~|    |putki: {{a~|b}} on joko a tai b          | -     |viiva tai useampi merkki
+|^      |rivin alku             |$               |rivin loppu
+|[[...] |jokin näistä merkeistä                  |[[^...] |mikä tahansa muu paitsi jokin näistä merkeistä
+|\b     |sanojen raja                            |\B     |mikä tahansa paitsi sanojen raja
+|\d     |numero [[0-9]                           |\D     |mikä tahansa paitsi numero [[^0-9]
+|\s     |tyhjä merkki                            |\S     |mikä tahansa paitsi tyhjä merkki 
+|\w     |[[A-Za-z0-9_]                           |\W     |[[^A-Za-z0-9_]
+|(...)  |ryhmä, joka tallennetaan muuttujiin $1..$9 |\.     |palauta tavalliseksi
+
+
+Korvaa-kentässä voidaan käyttää merkkejä $1...$9 viittaamaan vastaaviin sulkulausekkeisiin Etsi-kentässä.
+----
+Esimerkiksi:\\
+
+Lauseke __/abc|def/__ löytää merkkijonot 'abc' tai merkkijonot 'def'\\
+Lauseke  __/bwiki/b__ löytää kaikki 'wiki' -sanat, mutta ei sanaa 'jspwiki'.\\
+Lauseke __^[[IVXMDCL]+\.__ löytää kaikki roomalaiset numerot, joiden perässä on piste.\\
+Lauseke __/(-?\d+)(\d{3})/__ ja joka korvataan merkkijonolla __$1,$2__ laittaa pilkun kaikkiin isoihin numeroihin. 
+
+Tämä on  [EditFindAndReplaceHelp].
+[Lisätietoa säännöllisistä lausekkeista|http://www.regular-expressions.info/javascript.html] (englanniksi) 
+ja [hiekkalaatikko, jossa voit kokeilla|http://www.regular-expressions.info/javascriptexample.html].\\

Added: incubator/jspwiki/trunk/src/wikipages/fi/MoreMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fi/MoreMenu.txt?rev=672632&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fi/MoreMenu.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/fi/MoreMenu.txt Sun Jun 29 08:47:12 2008
@@ -0,0 +1,7 @@
+[Muutokset|Recent Changes]\\
+[Kaikki sivut|Page Index]\\
+[Tietoa|About]\\
+[SystemInfo]\\
+
+[Käyttämättömät sivut|UnusedPages]\\
+[Puuttuvat sivut|UndefinedPages]\\

Added: incubator/jspwiki/trunk/src/wikipages/fi/TitleBox.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fi/TitleBox.txt?rev=672632&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fi/TitleBox.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/fi/TitleBox.txt Sun Jun 29 08:47:12 2008
@@ -0,0 +1,3 @@
+%%center
+[Tervetuloa|TitleBox] [JSPWikin pariin|About]
+/%
\ No newline at end of file