svn commit: r829960 - in /incubator/jspwiki/trunk: build.xml src/WebContent/WEB-INF/classes/templates/default.properties src/WebContent/WEB-INF/classes/templates/default_nl.properties

[me...@apache.org]

Author: metskem
Date: Mon Oct 26 21:02:55 2009
New Revision: 829960

URL: http://svn.apache.org/viewvc?rev=829960&view=rev
Log:
* a few more tweaks to build.xml (webtests still fail though)
* a few i18n tweaks (EN NL)

Modified:
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=829960&r1=829959&r2=829960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Oct 26 21:02:55 2009
@@ -840,9 +840,9 @@
     <mkdir dir="${webtests.build}" />
   
     <!-- Create the master jspwiki.properties template for all webtests -->
-    <copy file="${tests.classpath}/jspwiki.properties"
-        toFile="${webtests.build}/jspwiki.properties.tmpl" flatten="true" />
-    <propertyfile file="${webtests.build}/jspwiki.properties.tmpl">
+    <copy file="${tests}/etc/jspwiki.properties"
+        toFile="${webtests.build}/jspwiki.properties" flatten="true" />
+    <propertyfile file="${webtests.build}/jspwiki.properties">
       <entry key="jspwiki.authorizer" value="org.apache.wiki.auth.authorize.WebContainerAuthorizer" />
       <entry key="jspwiki.userdatabase" value="org.apache.wiki.auth.user.XMLUserDatabase" />
       <entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.XMLGroupDatabase" />
@@ -954,7 +954,7 @@
       <!-- Create the jspwiki.properties file -->
       <mkdir dir="@{context.dir}/workdir" />
       <copy toFile="@{context.dir}/webapp/WEB-INF/jspwiki.properties"
-        file="${webtests.build}/jspwiki.properties.tmpl" flatten="true" />
+        file="${webtests.build}/jspwiki.properties" flatten="true" />
         <propertyfile file="@{context.dir}/webapp/WEB-INF/jspwiki.properties">
           <entry key="jspwiki.baseURL"                            value="http://localhost:${webtests.port}/@{context}/" />
           <entry key="jspwiki.workDir"                            value="@{context.path}/workdir" />
@@ -967,9 +967,12 @@
       </propertyfile>
 
       <!-- Copy the classes -->
-      <copy toDir="@{context.dir}/webapp/WEB-INF/classes">
-        <fileset dir="etc" includes="oscache.properties" />
-      </copy>
+        <copy toDir="@{context.dir}/webapp/WEB-INF/classes">
+          <fileset dir="etc" includes="priha.properties" />
+        </copy>
+        <copy toDir="@{context.dir}/webapp/WEB-INF">
+          <fileset dir="tests/etc" includes="keychain" />
+        </copy>
       <copy toDir="@{context.dir}/webapp/WEB-INF/classes">
         <fileset dir="${tests.classpath}" includes="log4j.properties" />
         <filterset>
@@ -1021,7 +1024,7 @@
            <path refid="path.tests" />
         </classpath>
         <sysproperty key="java.io.tmpdir" value="${webtests.temp}" />
-        <sysproperty key="log4j.debug" value="yesplease" />
+        <sysproperty key="log4j.debug" value="true" />
         <!--
         <jvmarg value="-Xdebug" />
         <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" />
@@ -1113,7 +1116,7 @@
          DROP TABLE @jspwiki.userdatabase.table@ IF EXISTS;
 
        The complete list of customizable table properties are found
-       in etc/jspwiki.properties.tmpl. If you don't customize them,
+       in etc/jspwiki.properties. If you don't customize them,
        JSPWiki will use some sensible defaults. For unit testing purposes,
        this script will always use the defaults from '${tests.classpath}/jspwiki.properties',
        then apply any custom properties defined in your build.properties file.
@@ -1129,7 +1132,7 @@
 
        1) Configure the Jdbc.* properties in build.properties, as described
           above
-       2) Configure table and column mappings in etc/jspwiki.properties.tmpl
+       2) Configure table and column mappings in etc/jspwiki.properties
        3) Configure your web container to create a JDBC DataSource
           (by default, the JNDI name is jdbc/UserDatabase)
        4) Put the JDBC driver jar in a place where your web container will

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties?rev=829960&r1=829959&r2=829960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties Mon Oct 26 21:02:55 2009
@@ -449,7 +449,8 @@
 editor.plain.tbCODE.title=code - Insert code block
 editor.plain.tbQUOTE.title=quote - Insert quoted block
 editor.plain.tbSIGN.title=sign - Insert your signature
-editor.plain.tbVERT.title=preview - under or right side
+editor.plain.tbVERT.title=preview - under
+editor.plain.tbHORZ.title=preview - right
 editor.preview.edit.submit=Keep editing
 editor.preview.edit.title=Continue to edit the current page [ e ]
 editor.preview.save.submit=Save

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties?rev=829960&r1=829959&r2=829960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties Mon Oct 26 21:02:55 2009
@@ -443,7 +443,8 @@
 editor.plain.tbCODE.title=code - Voeg code blok in
 editor.plain.tbQUOTE.title=quote - Voeg quote blok in
 editor.plain.tbSIGN.title=sign - Voeg handtekening in
-editor.plain.tbVERT.title=preview - onder of rechts
+editor.plain.tbVERT.title=preview - onder
+editor.plain.tbHORZ.title=preview - rechts
 editor.preview.edit.submit=Verder gaan
 editor.preview.edit.title=Verder gaan met het wijzigen van deze pagina [ e ]
 editor.preview.save.submit=Bewaar