jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1566003 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/java/org/apache/wiki/ui/ jspwiki-war/src/main/resources/ jspwiki-war/src/main/webapp/ jspwiki-war/src/test/java/org/apache/wiki/ jspwiki-war/sr...
Date Sat, 08 Feb 2014 12:06:48 GMT
Author: metskem
Date: Sat Feb  8 12:06:47 2014
New Revision: 1566003

URL: http://svn.apache.org/r1566003
Log:
2014-02-08  Harry Metske (metskem@apache.org)

       * Fixed JSPWIKI-817 - Install.jsp is broken ==> Translation corrections required
(EN en NL done)
       * Removed a bunch of System.out.println() statements from TestCases.

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_es.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fi.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fr.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_it.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_nl.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_ru.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
    jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Feb  8 12:06:47 2014
@@ -1,3 +1,8 @@
+2014-02-08  Harry Metske (metskem@apache.org)
+
+       * Fixed JSPWIKI-817 - Install.jsp is broken ==> Translation corrections required
(EN en NL done)
+       * Removed a bunch of System.out.println() statements from TestCases.
+
 2014-01-13  Harry Metske (metskem@apache.org)
 
        * 2.10.0 - second RC 
@@ -6,7 +11,6 @@
 
        * added new CleanBlue skin, contributed by Ichiro Furusato.
 
-
 2014-01-12  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.10.0-svn-68

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sat Feb  8 12:06:47
2014
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "";
+    public static final String     BUILD         = "70";
     
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java Sat Feb  8 12:06:47
2014
@@ -18,10 +18,14 @@
  */
 package org.apache.wiki.ui;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.text.MessageFormat;
 import java.util.Properties;
 import java.util.ResourceBundle;
+import java.util.Set;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -38,8 +42,6 @@ import org.apache.wiki.auth.user.UserPro
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.providers.BasicAttachmentProvider;
 import org.apache.wiki.providers.FileSystemProvider;
-import org.apache.wiki.util.CommentedProperties;
-import org.apache.wiki.util.PropertyReader;
 import org.apache.wiki.util.TextUtil;
 
 /**
@@ -58,10 +60,12 @@ public class Installer
     public static final String APP_NAME = WikiEngine.PROP_APPNAME;
     public static final String BASE_URL = WikiEngine.PROP_BASEURL;
     public static final String STORAGE_DIR = BasicAttachmentProvider.PROP_STORAGEDIR;
-    public static final String LOG_DIR = "log4j.appender.FileLog.File";
+    public static final String LOG_FILE = "log4j.appender.FileLog.File";
     public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
     public static final String WORK_DIR = WikiEngine.PROP_WORKDIR;
     public static final String ADMIN_GROUP = "Admin";
+    public static final String PROPFILENAME = "jspwiki-custom.properties" ;
+    public static final String TMP_DIR = System.getProperty("java.io.tmpdir");
     private final WikiSession m_session;
     private final File m_propertyFile;
     private final Properties m_props;
@@ -69,17 +73,15 @@ public class Installer
     private HttpServletRequest m_request;
     private boolean m_validated;
     
-    public Installer( HttpServletRequest request, ServletConfig config )
-    {
+    public Installer( HttpServletRequest request, ServletConfig config ) throws IOException
{
         // Get wiki session for this user
         m_engine = WikiEngine.getInstance( config );
         m_session = WikiSession.getWikiSession( m_engine, request );
         
         // Get the servlet context, and file for properties
         ServletContext context = config.getServletContext();
-        String path = context.getRealPath("/");
-        m_propertyFile = new File( path, PropertyReader.DEFAULT_JSPWIKI_CONFIG );
-        m_props = new CommentedProperties();
+        m_propertyFile = new File(TMP_DIR, PROPFILENAME);
+        m_props = new Properties();
         
         // Stash the request
         m_request = request;
@@ -109,7 +111,7 @@ public class Installer
     }
     
     /**
-     * Creates an adminstrative user and returns the new password.
+     * Creates an administrative user and returns the new password.
      * If the admin user exists, the password will be <code>null</code>.
      * @return the password
      * @throws WikiSecurityException
@@ -164,14 +166,19 @@ public class Installer
     }
     
     /**
-     * Returns the properties file as a string
+     * Returns the properties as a "key=value" string separated by newlines
      * @return the string
      */
-    public String getProperties()
+    public String getPropertiesList()
     {
-        return m_props.toString();
+        StringBuilder result = new StringBuilder();
+        Set<String> keys = m_props.stringPropertyNames();
+        for (String key:keys) {
+            result.append(key + " = " + m_props.getProperty(key) + "\n");
+        }
+        return result.toString();
     }
-    
+
     public String getPropertiesPath()
     {
         return m_propertyFile.getAbsolutePath();
@@ -194,30 +201,7 @@ public class Installer
                                                       m_session.getLocale() );
         m_validated = false;
         
-        try
-        {
-            InputStream in = null; 
-            try
-            {
-                // Load old properties from disk
-                in = new FileInputStream( m_propertyFile ); 
-                m_props.load( in );
-            }
-            finally
-            {
-                if( in != null ) 
-                {
-                    in.close();
-                }
-            }
-        }
-        catch( IOException e )
-        {
-            Object[] args = { e.getMessage() };
-            m_session.addMessage( INSTALL_ERROR, MessageFormat.format( 
-                                        rb.getString( "install.installer.unable.read.props"
), args ) );
-        }
-        
+
         // Get application name
         String nullValue = m_props.getProperty( APP_NAME, rb.getString( "install.installer.default.appname"
) );
         parseProperty( APP_NAME, nullValue );
@@ -234,12 +218,12 @@ public class Installer
         sanitizePath( PAGE_DIR );
         
         // Get/sanitize log directory
-        nullValue = m_props.getProperty( LOG_DIR, "/tmp/" );
-        parseProperty( LOG_DIR, nullValue );
-        sanitizePath( LOG_DIR );
+        nullValue = m_props.getProperty( LOG_FILE, TMP_DIR + File.separator + "jspwiki.log"
);
+        parseProperty( LOG_FILE, nullValue );
+        sanitizePath( LOG_FILE );
         
         // Get/sanitize work directory
-        nullValue = m_props.getProperty( WORK_DIR, "/tmp/" );
+        nullValue = m_props.getProperty( WORK_DIR, TMP_DIR );
         parseProperty( WORK_DIR, nullValue );
         sanitizePath( WORK_DIR );
         
@@ -250,13 +234,11 @@ public class Installer
         // Set a few more default properties, for easy setup
         m_props.setProperty( STORAGE_DIR, m_props.getProperty( PAGE_DIR ) );
         m_props.setProperty( PageManager.PROP_PAGEPROVIDER, "VersioningFileProvider" );
-        m_props.setProperty( WikiEngine.PROP_ENCODING, "UTF-8" );
     }
     
     public void saveProperties()
     {
-        ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
-                                                      m_session.getLocale() );
+        ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
m_session.getLocale() );
         // Write the file back to disk
         try
         {
@@ -273,28 +255,25 @@ public class Installer
                     out.close();
                 }
             }
-            m_session.addMessage( INSTALL_INFO,
-                rb.getString( "install.installer.props.saved" ) );
+            m_session.addMessage( INSTALL_INFO, MessageFormat.format(rb.getString("install.installer.props.saved"),
m_propertyFile) );
         }
         catch( IOException e )
         {
             Object[] args = { e.getMessage(), m_props.toString() };
-            m_session.addMessage( INSTALL_ERROR, 
-                                  MessageFormat.format( rb.getString( "install.installer.props.notsaved"
), args ) );
+            m_session.addMessage( INSTALL_ERROR, MessageFormat.format( rb.getString( "install.installer.props.notsaved"
), args ) );
         }
     }
     
     public boolean validateProperties() throws Exception
     {
-        ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
-                                                      m_session.getLocale() );
+        ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
m_session.getLocale() );
         m_session.clearMessages( INSTALL_ERROR );
         parseProperties();
         validateNotNull( BASE_URL, rb.getString( "install.installer.validate.baseurl" ) );
         validateNotNull( PAGE_DIR, rb.getString( "install.installer.validate.pagedir" ) );
         validateNotNull( APP_NAME, rb.getString( "install.installer.validate.appname" ) );
         validateNotNull( WORK_DIR, rb.getString( "install.installer.validate.workdir" ) );
-        validateNotNull( LOG_DIR, rb.getString( "install.installer.validate.logdir" ) );
+        validateNotNull( LOG_FILE, rb.getString( "install.installer.validate.logfile" ) );
         
         if ( m_session.getMessages( INSTALL_ERROR ).length == 0 )
         {
@@ -317,7 +296,7 @@ public class Installer
         {
             value = defaultValue;
         }
-        m_props.put( param, value );
+        m_props.put(param, value);
     }
     
     /**

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources.properties Sat Feb  8 12:06:47
2014
@@ -143,14 +143,12 @@ captcha.submit=Submit
 # Install.jsp
 install.jsp.title=JSPWiki Installer
 install.jsp.intro.title=JSPWiki Installer
-install.jsp.intro.p1=Welcome\!  This little JSP page is here to help you do the first difficult
stage of JSPWiki installation.  If you're seeing this page, you have already installed JSPWiki
correctly inside your container.
-install.jsp.intro.p2=There are now some things that you should configure.  When you press
Configure, the \
-                     <code>jspwiki.properties</code> file from the distribution
will be modified, or if it \
-                     can't be found, a new one will be created.
+install.jsp.intro.p1=Welcome\!  This page is to help you with the first stage of JSPWiki
installation.  If you're seeing this page, you already have JSPWiki running in your container.
+install.jsp.intro.p2=There are now some things that you should configure.  When you press
the Configure button below, we will generate a \
+                     <code>jspwiki-custom.properties</code> file for you.
 install.jsp.intro.p3=This setup system is really meant for people who just want to be up
and running really quickly. \
                      If you want to integrate JSPWiki with an existing system, I would recommend
that you go and edit \
-                     the <code>jspwiki.properties</code> file directly.  You
can find a sample config file from \
-                     <code>yourwiki/WEB-INF/</code>.
+                     a <code>jspwiki-custom.properties</code> file directly and
put that somewhere on the classpath.  You can find a                         sample config
file at <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Documentation"> our wiki
</a>.
 install.jsp.install.info=Good news: 
 install.jsp.install.warning=Warning: 
 install.jsp.install.error=Could not save configuration: 
@@ -162,13 +160,13 @@ install.jsp.install.msg.admin.notexists=
 
 install.jsp.basics.title=Basics
 install.jsp.basics.appname.label=Application Name
-install.jsp.basics.appname.desc=What should your wiki be called?  Try to use a relatively
short name.
+install.jsp.basics.appname.desc=What should your wiki be called?  Try to use a relative short
name.
 install.jsp.basics.baseurl.label=Base URL
-install.jsp.basics.baseurl.desc=Please tell JSPWiki where your wiki is located.
+install.jsp.basics.baseurl.desc=At what URL do you want to your wiki located (fully qualified)
?
 install.jsp.basics.page.storage.label=Page storage
-install.jsp.basics.page.storage.desc=By default, JSPWiki will use the VersioningFileProvider
that stores files in a particular \
-                                     directory on your hard drive. If you specify a directory
that does not exist, JSPWiki will \
-                                     create one for you. All attachments will also be put
in the same directory.
+install.jsp.basics.page.storage.desc=By default, JSPWiki will use the VersioningFileProvider
that stores files in a \
+                                     directory. If you specify a directory that does not
exist, JSPWiki will \
+                                     try to create it for you. All attachments will also
be put in the same directory.
 
 install.jsp.security.title=Security
 install.jsp.security.sec.conf.label=Security configuration
@@ -188,26 +186,25 @@ install.jsp.security.admaccount.enabled.
 install.jsp.security.admaccount.notenabled.desc=This wiki doesn't seem to have an administrator
account. When you click <em>Configure\!</em>,JSPWiki will create one for you.
 
 install.jsp.adv.settings.title=Advanced Settings
-install.jsp.adv.settings.logfile.label=Log files
-install.jsp.adv.settings.logfile.desc=JSPWiki uses Apache Log4j for logging.  Please tell
JSPWiki where the log files should go.
+install.jsp.adv.settings.logfile.label=Log file
+install.jsp.adv.settings.logfile.desc=JSPWiki uses Apache Log4j for logging.  Please tell
JSPWiki to what file the logging should go.
 install.jsp.adv.settings.workdir.label=Work directory
 install.jsp.adv.settings.workdir.desc=This is the place where all caches and other runtime
stuff is stored.
 install.jsp.instr.desc=After you click <em>Configure\!</em>, the installer will
write your settings to <code>{0}</code>. It will also create an Administrator
account with a random password and a corresponding Admin group. 
 install.jsp.instr.submit=Configure!
-install.jsp.validated.new.props=Here is your new jspwiki.properties
+install.jsp.validated.new.props=Here is your new jspwiki-custom.properties
 
 # Installer.java
 install.installer.unable.read.props=Unable to read properties: {0}
 install.installer.default.appname=MyWiki
-install.installer.default.pagedir=Please configure me!
-install.installer.props.saved=Your new properties have been saved.  Please restart your container
(unless this was your first \
-                              install).  Scroll down a bit to see your new jspwiki.properties.
-install.installer.props.notsaved=Unable to write properties\: {0}. Please copy the file below
as your jspwiki.properties\:\n{1}
-install.installer.validate.baseurl=You must define the base URL for this wiki.
-install.installer.validate.pagedir=You must define the location where the files are stored.
+install.installer.default.pagedir=Please provide a directory for the pages!
+install.installer.props.saved=Your new properties have been saved to {0}. Copy this file
to a directory that is on the classpath of your container (tomcat lib directory for example),
then restart your container. Scroll down a bit to see your new jspwiki-custom.properties.
+install.installer.props.notsaved=Unable to write properties\: {0}. Please copy the file below
as your jspwiki-custom.properties\:\n{1}
+install.installer.validate.baseurl=You must define the baseURL for this wiki.
+install.installer.validate.pagedir=You must define the location where the pages are stored.
 install.installer.validate.appname=You must define the application name.
 install.installer.validate.workdir=You must define a work directory.
-install.installer.validate.logdir=You must define a log directory.
+install.installer.validate.logfile=You must define a log file.
 
 # RSSImageLinkTag
 rss.title=RSS feed for page {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_de.properties Sat Feb  8 12:06:47
2014
@@ -221,7 +221,7 @@ install.installer.validate.baseurl=Du mu
 install.installer.validate.pagedir=Du musst das Verzeichnis angeben, in dem die Wiki-Inhalte
gespeichert werden sollen.
 install.installer.validate.appname=Du musst einen Anwendungsnamen angeben.
 install.installer.validate.workdir=Du musst ein Arbeitsverzeichnis angeben.
-install.installer.validate.logdir=Du musst ein Log-Verzeichnis angeben.
+install.installer.validate.logfile=Du musst ein Log-Verzeichnis angeben.
 
 # RSSImageLinkTag
 rss.title=RSS-Feed für die Seite {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_es.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_es.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_es.properties Sat Feb  8 12:06:47
2014
@@ -189,7 +189,7 @@ install.installer.validate.baseurl=Tiene
 install.installer.validate.pagedir=Tienes que definir la ruta dónde quieres guardar los
ficheros.
 install.installer.validate.appname=Tienes que definir el nombre de la aplicación.
 install.installer.validate.workdir=Tienes que definir un directorio de trabajo.
-install.installer.validate.logdir=Tienes que definir un directorio de log.
+install.installer.validate.logfile=Tienes que definir un directorio de log.
 
 # RSSImageLinkTag
 rss.title=Canal RSS de la página {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fi.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fi.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fi.properties Sat Feb  8 12:06:47
2014
@@ -122,7 +122,7 @@ install.installer.props.saved = Uudet as
 install.installer.unable.read.props = En voinut lukea asetuksia: {0}
 install.installer.validate.appname = Sinun on määriteltävä wikillesi nimi.
 install.installer.validate.baseurl = Sinun on määriteltävä perus-URL tälle wikille.
-install.installer.validate.logdir = Sinun on määriteltävä hakemisto lokeille.
+install.installer.validate.logfile = Sinun on määriteltävä hakemisto lokeille.
 install.installer.validate.pagedir = Sinun on määriteltävä hakemisto, minne sivut ja
liitteet tallennetaan.
 install.installer.validate.workdir = Sinun on määriteltävä työhakemisto.
 install.jsp.adv.settings.logfile.desc = Mihin hakemistoon logitiedostot tulisi sijoittaa?

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fr.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fr.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_fr.properties Sat Feb  8 12:06:47
2014
@@ -225,7 +225,7 @@ install.installer.validate.baseurl=Vous 
 install.installer.validate.pagedir=Vous devez d\u00E9finir le r\u00E9pertoire de stockage
des fichiers.
 install.installer.validate.appname=Vous devez d\u00E9finir le nom de l\u0027application.
 install.installer.validate.workdir=Vous devez d\u00E9finir un r\u00E9pertoire de travail.
-install.installer.validate.logdir=Vous devez d\u00E9finir un r\u00E9pertoire de journalisation.
+install.installer.validate.logfile=Vous devez d\u00E9finir un r\u00E9pertoire de journalisation.
 
 # RSSImageLinkTag
 rss.title=Source RSS pour la page {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_it.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_it.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_it.properties Sat Feb  8 12:06:47
2014
@@ -213,7 +213,7 @@ install.installer.validate.baseurl=Occor
 install.installer.validate.pagedir=Occorre definire il posto dove salvare i file.
 install.installer.validate.appname=Occorre definire il nome dell'applicazione.
 install.installer.validate.workdir=Occorre definire la work directory.
-install.installer.validate.logdir=Occorre definire la log directory.
+install.installer.validate.logfile=Occorre definire la log directory.
 
 # RSSImageLinkTag
 rss.title=RSS per la pagina {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_nl.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_nl.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_nl.properties Sat Feb  8 12:06:47
2014
@@ -140,16 +140,14 @@ captcha.submit=Submit
 # Install.jsp
 install.jsp.title=JSPWiki Installer
 install.jsp.intro.title=JSPWiki Installer
-install.jsp.intro.p1=Welkom!  Deze kleine JSP helpt je door de eerste moeilijke fase van
JSPWiki \
-                     installatie.  Als je deze pagina ziet, dan heb je JSPWiki al correct
geinstalleerd \
-                     in je (web)container.
-install.jsp.intro.p2=Er zijn een aantal dingen die je moet configureren.  Als je Configureer
klikt , zal de standaard \
-                     <code>jspwiki.properties</code> file worden gewijzigd, of
als ie \
-                     niet gevonden kan worden, zal er een hagelnieuwe worden gemaakt.
+install.jsp.intro.p1=Welkom!  Deze pagina helpt je met de eerste fase van JSPWiki \
+                     installatie.  Als je deze pagina ziet, dan draait JSPWiki al correct
in je (web)container.
+install.jsp.intro.p2=Er zijn een aantal dingen die je moet configureren.  Als je op de Configureer
knop onderaan klikt , \
+                      zal de standaard <code>jspwiki-custom.properties</code>
file worden aangemaakt.
 install.jsp.intro.p3=Dit setup systeem is echt bedoeld voor mensen die meteen aan de slag
willen. \
                      Als je JSPWiki wilt integreren in een bestaande omgeving, dan raad ik
toch aan om de file \
-                      <code>jspwiki.properties</code> zelf met het handje te
wijzigen.  Je vindt een voorbeeld in \
-                     <code>yourwiki/WEB-INF/</code>.
+                      <code>jspwiki-custom.properties</code> zelf met het handje
te wijzigen en ergens op het classpath te zetten. Je vindt een voorbeeld op \
+                     <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Documentation">
onze wiki </a>.
 install.jsp.install.info=Goed nieuws: 
 install.jsp.install.warning=Waarschuwing: 
 install.jsp.install.error=Kon de configuratie niet opslaan: 
@@ -167,9 +165,9 @@ install.jsp.basics.title=Basics
 install.jsp.basics.appname.label=Applicatie naam
 install.jsp.basics.appname.desc=Hoe moet je wiki heten ?  Probeer deze naam zinvol en kort
te houden..
 install.jsp.basics.baseurl.label=Base URL
-install.jsp.basics.baseurl.desc=Vertel JSPWiki waar je wiki zich bevindt.
+install.jsp.basics.baseurl.desc=Op welke URL moet de wiki te vinden zijn straks?
 install.jsp.basics.page.storage.label=Pagina opslag
-install.jsp.basics.page.storage.desc=Standaard gebruikt JSPWiki de VersioningFileProvider
die files opslaat in een directory op schijf \
+install.jsp.basics.page.storage.desc=Standaard gebruikt JSPWiki de VersioningFileProvider
die files opslaat in een directory \
                                      Als je een directory opgeeft die niet bestaat, zal JSPWiki
er een \
                                      voor je aanmaken. Alle attachments worden ook in deze
directory opgeslagen.
 
@@ -191,27 +189,28 @@ install.jsp.security.admaccount.notenabl
                                                 klikt, zal JSPWiki er een voor je maken.
 
 install.jsp.adv.settings.title=Advanced Settings
-install.jsp.adv.settings.logfile.label=Log files
-install.jsp.adv.settings.logfile.desc=JSPWiki gebruikt Apache Log4j voor logging.  Vertel
JSPWiki waar de log files terecht moeten komen.
+install.jsp.adv.settings.logfile.label=Log file
+install.jsp.adv.settings.logfile.desc=JSPWiki gebruikt Apache Log4j voor logging.  Vertel
JSPWiki naar welke file moet worden gelogd.
 install.jsp.adv.settings.workdir.label=Work directory
 install.jsp.adv.settings.workdir.desc=Dit is de plek waar alle caches en andere runtime spullen
worden opgeslagen.
 install.jsp.instr.desc=Als je op <em>Configure!</em> klikt, zal de Installer
je instelling opslaan in <code>{0}</code>. \
                        Hij zal ook een Administrator account met een random wachtwoord en
een Admin group aanmaken. 
 install.jsp.instr.submit=Configureer!
-install.jsp.validated.new.props=Hier is je hagelnieuwe jspwiki.properties
+install.jsp.validated.new.props=Hier is je hagelnieuwe jspwiki-custom.properties
 
 # Installer.java
 install.installer.unable.read.props=Kan de properties niet lezen: {0}
 install.installer.default.appname=MijnWiki
-install.installer.default.pagedir=Configureer mij!
-install.installer.props.saved=Je nieuwe properties zijn opgeslagen.  Herstart je container
(behalve wanneer dit je eerste \
-                              installatie was).  Scroll naar beneden om je nieuwe jspwiki.properties
te zien.
-install.installer.props.notsaved=Kan de properties niet wegschrijven: {0}. Sla onderstaande
file op als jspwiki.properties:\n{1}
-install.installer.validate.baseurl=Je moet de base URL voor deze wiki definieren.
+install.installer.default.pagedir=Geef een directory op waar de pagina's moeten komen!
+install.installer.props.saved=Je nieuwe properties zijn opgeslagen in {0}. Copy deze file
naar een directory die op het \
+                               classpath van je container staat (tomcat lib directory b.v.),
daarna je container herstarten.\
+                               Scroll naar beneden om je nieuwe jspwiki.properties te zien.
+install.installer.props.notsaved=Kan de properties niet wegschrijven: {0}. Sla onderstaande
file op als jspwiki-custom.properties:\n{1}
+install.installer.validate.baseurl=Je moet de baseURL voor deze wiki definieren.
 install.installer.validate.pagedir=Je moet de plek configureren waar de pagina's moeten worden
opgeslagen.
 install.installer.validate.appname=Je moet de applicatie naam opgeven
 install.installer.validate.workdir=Je moet de work directory opgeven.
-install.installer.validate.logdir=Je moet de log directory opgeven.
+install.installer.validate.logfile=Je moet de log file opgeven.
 
 # RSSImageLinkTag
 rss.title=RSS feed voor pagina {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties Sat Feb  8
12:06:47 2014
@@ -212,7 +212,7 @@ install.installer.validate.baseurl=Você
 install.installer.validate.pagedir=Você deve definir o local onde os arquivos serão armazenados.
 install.installer.validate.appname=Você deve definir o nome da aplicação.
 install.installer.validate.workdir=Você deve definir um diretório de trabalho.
-install.installer.validate.logdir=Você deve definir um diretório para logs.
+install.installer.validate.logfile=Você deve definir um diretório para logs.
 
 # RSSImageLinkTag
 rss.title=RSS feed para página {0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_ru.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_ru.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_ru.properties Sat Feb  8 12:06:47
2014
@@ -216,7 +216,7 @@ install.installer.validate.baseurl=\u041
 install.installer.validate.pagedir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f
\u0437\u0430\u043f\u0438\u0441\u0435\u0439.
 install.installer.validate.appname=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c
\u0438\u043c\u044f \u0432\u0438\u043a\u0438.
 install.installer.validate.workdir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c
\u0440\u0430\u0431\u043e\u0447\u0443\u044e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e.
-install.installer.validate.logdir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0434\u043b\u044f \u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f.
+install.installer.validate.logfile=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0434\u043b\u044f \u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f.
 
 # RSSImageLinkTag
 rss.title=RSS \u043f\u043e\u0442\u043e\u043a \u0434\u043b\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
{0}

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties Sat Feb  8
12:06:47 2014
@@ -217,7 +217,7 @@ install.installer.validate.baseurl=\u5fc
 install.installer.validate.pagedir=\u5fc5\u987b\u5b9a\u4e49\u6587\u4ef6\u4fdd\u5b58\u7684\u4f4d\u7f6e\u3002
 install.installer.validate.appname=\u5fc5\u987b\u5b9a\u4e49\u5e94\u7528\u7a0b\u5e8f\u540d\u79f0\u3002
 install.installer.validate.workdir=\u5fc5\u987b\u5b9a\u4e49\u5de5\u4f5c\u76ee\u5f55\u3002
-install.installer.validate.logdir=\u5fc5\u987b\u5b9a\u4e49\u65e5\u5fd7\u76ee\u5f55\u3002
+install.installer.validate.logfile=\u5fc5\u987b\u5b9a\u4e49\u65e5\u5fd7\u76ee\u5f55\u3002
 
 # RSSImageLinkTag
 rss.title=\u9875\u9762 {0} \u7684 RSS \u8ba2\u9605\u6e90

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp Sat Feb  8 12:06:47 2014
@@ -113,19 +113,19 @@ if ( !installer.adminExists() )
   <div class="block">
   
     <label><fmt:message key="install.jsp.basics.appname.label" /></label>
-    <input type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty(
Installer.APP_NAME )%>"/><br />
+    <input type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty(
Installer.APP_NAME )%>"/>
     <div class="description">
-      <fmt:message key="install.jsp.basics.appname.desc" />
-    </div>
+      <fmt:message key="install.jsp.basics.appname.desc"/>
+    </div> 
     
-    <label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
-    <input type="text" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty(
Installer.BASE_URL )%>"/><br />
+    <br/> <label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
+    <input type="text" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty(
Installer.BASE_URL )%>"/>
     <div class="description">
       <fmt:message key="install.jsp.basics.baseurl.desc" />
-    </div>
+    </div> 
     
-    <label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
-    <input type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty(
Installer.PAGE_DIR )%>"/><br />
+    <br/><label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
+    <input type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty(
Installer.PAGE_DIR )%>"/>
     <div class="description">
       <fmt:message key="install.jsp.basics.page.storage.desc" />
     </div>
@@ -174,19 +174,19 @@ if ( !installer.adminExists() )
   <h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
   <div class="block">
     <label><fmt:message key="install.jsp.adv.settings.logfile.label" /></label>
-    <input type="text" name="<%=Installer.LOG_DIR%>" value="<%=installer.getProperty(
Installer.LOG_DIR )%>" size="40"/><br />
+    <input type="text" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty(
Installer.LOG_FILE )%>" size="40"/>
     <div class="description">
       <fmt:message key="install.jsp.adv.settings.logfile.desc" />
-    </div>
+    </div> <br/>
 
     <label><fmt:message key="install.jsp.adv.settings.workdir.label" /></label>
-    <input type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty(
Installer.WORK_DIR )%>"/><br />
+    <input type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty(
Installer.WORK_DIR )%>"/>
     <div class="description">
       <fmt:message key="install.jsp.adv.settings.workdir.desc" />
     </div>
   </div>
   
-  <br /><br />
+  <br/>
   <div class="block">
     <div class="instructions">
       <fmt:message key="install.jsp.instr.desc" >
@@ -206,7 +206,7 @@ if ( !installer.adminExists() )
       {
     %>
        <h3><fmt:message key="install.jsp.validated.new.props" /></h3>
-       <pre><%=installer.getProperties()%></pre>
+       <pre><%=installer.getPropertiesList()%></pre>
    <%
      }
    %>
@@ -216,4 +216,4 @@ if ( !installer.adminExists() )
 </div>
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java Sat Feb
 8 12:06:47 2014
@@ -42,7 +42,7 @@ public class PropertyReaderTest extends 
         assertTrue( p.getProperty("jspwiki.workDir").endsWith("/p/mywiki/wrk/") );
         assertTrue( p.getProperty("jspwiki.xyz").endsWith("test basedir") ); //don't touch
this
         
-        System.out.println(p.getProperty("jspwiki.workDir"));
+//        System.out.println(p.getProperty("jspwiki.workDir"));
         
         assertFalse( p.getProperty("jspwiki.workDir").endsWith("$basedir/wrk/") );
     }

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
Sat Feb  8 12:06:47 2014
@@ -129,7 +129,7 @@ public class DefaultAclManagerTest
         acl = "[{ALLOW view Alice}] Test text.";
         m = DefaultAclManager.ACL_PATTERN.matcher( acl );
         assertTrue ( m.find() );
-        System.out.println( m.group() );
+//        System.out.println( m.group() );
         assertEquals( 2, m.groupCount() );
         assertEquals( "[{ALLOW view Alice}]", m.group(0) );
         assertEquals( "view", m.group(1) );
@@ -139,7 +139,7 @@ public class DefaultAclManagerTest
         acl = "Test text   [{   ALLOW   view   Alice  }]  Test text.";
         m = DefaultAclManager.ACL_PATTERN.matcher( acl );
         assertTrue ( m.find() );
-        System.out.println( m.group() );
+//        System.out.println( m.group() );
         assertEquals( 2, m.groupCount() );
         assertEquals( "[{   ALLOW   view   Alice  }]", m.group(0) );
         assertEquals( "view", m.group(1) );
@@ -149,7 +149,7 @@ public class DefaultAclManagerTest
         acl = "Test text   [{   ALLOW   view  Alice  ,  Bob  }]  Test text.";
         m = DefaultAclManager.ACL_PATTERN.matcher( acl );
         assertTrue ( m.find() );
-        System.out.println( m.group() );
+//        System.out.println( m.group() );
         assertEquals( 2, m.groupCount() );
         assertEquals( "[{   ALLOW   view  Alice  ,  Bob  }]", m.group(0) );
         assertEquals( "view", m.group(1) );
@@ -159,7 +159,7 @@ public class DefaultAclManagerTest
         acl = "Test text   [{   ALLOW   view  Alice  ,  Bob  }]  Test text  [{ALLOW edit
Betty}].";
         m = DefaultAclManager.ACL_PATTERN.matcher( acl );
         assertTrue ( m.find() );
-        System.out.println( m.group() );
+//        System.out.println( m.group() );
         assertEquals( 2, m.groupCount() );
         assertEquals( "[{   ALLOW   view  Alice  ,  Bob  }]", m.group(0) );
         assertEquals( "view", m.group(1) );

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
Sat Feb  8 12:06:47 2014
@@ -65,7 +65,7 @@ public class RenderingManagerTest extend
         
         StopWatch sw = new StopWatch();
         
-        System.out.println("DOM cache speed test:");
+        // System.out.println("DOM cache speed test:");
         sw.start();
         
         for( int i = 0; i < 300; i++ )
@@ -84,7 +84,7 @@ public class RenderingManagerTest extend
         }
         
         sw.stop();
-        System.out.println("  Nocache took "+sw);
+        // System.out.println("  Nocache took "+sw);
 
         long nocachetime = sw.getTime();
         
@@ -104,10 +104,10 @@ public class RenderingManagerTest extend
         }
         
         sw.stop();
-        System.out.println("  Cache took "+sw);
+        // System.out.println("  Cache took "+sw);
         
         long speedup = nocachetime / sw.getTime();
-        System.out.println("  Approx speedup: "+speedup+"x");
+        //System.out.println("  Approx speedup: "+speedup+"x");
     }
 
     public static Test suite()

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=1566003&r1=1566002&r2=1566003&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java Sat
Feb  8 12:06:47 2014
@@ -116,15 +116,15 @@ public class RPCHandlerTest extends Test
         Calendar cal = Calendar.getInstance();
         cal.setTime( d );
 
-        System.out.println("Real: "+directInfo.getLastModified() );
-        System.out.println("RPC:  "+d );
+        // System.out.println("Real: "+directInfo.getLastModified() );
+        // System.out.println("RPC:  "+d );
 
         // Offset the ZONE offset and DST offset away.  DST only
         // if we're actually in DST.
         cal.add( Calendar.MILLISECOND,
                  (cal.get( Calendar.ZONE_OFFSET )+
                   (cal.getTimeZone().inDaylightTime( d ) ? cal.get( Calendar.DST_OFFSET )
: 0 ) ) );
-        System.out.println("RPC2: "+cal.getTime() );
+        // System.out.println("RPC2: "+cal.getTime() );
 
         assertEquals( "date", cal.getTime().getTime(),
                       directInfo.getLastModified().getTime() );



Mime
View raw message