You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/28 19:01:40 UTC
[11/14] jspwiki git commit: JSPWIKI-1035 - more updates from Harry
JSPWIKI-1035 - more updates from Harry
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/41bb9760
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/41bb9760
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/41bb9760
Branch: refs/heads/develop
Commit: 41bb9760f77248cd192a489a6c1feed7d212e24c
Parents: 6d85300
Author: Harry Metske <ha...@gmail.com>
Authored: Fri Dec 16 17:08:33 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Fri Dec 16 17:08:33 2016 +0100
----------------------------------------------------------------------
README | 2 +-
README.md | 2 +-
.../src/main/resources/jspwiki-custom.properties | 1 -
.../src/main/resources/jspwiki-custom.properties | 1 -
.../WEB-INF/classes/jspwiki-custom.properties | 1 -
.../personal/WEB-INF/classes/jspwiki-custom.properties | 1 -
.../src/main/java/org/apache/wiki/WikiEngine.java | 3 ---
.../src/main/java/org/apache/wiki/rss/RSSGenerator.java | 12 +-----------
.../src/main/java/org/apache/wiki/ui/Installer.java | 10 +---------
.../main/java/org/apache/wiki/ui/WikiServletFilter.java | 1 -
jspwiki-war/src/main/resources/CoreResources.properties | 1 -
.../src/main/resources/CoreResources_nl.properties | 5 ++---
jspwiki-war/src/main/webapp/rss.jsp | 2 +-
.../test/java/org/apache/wiki/rss/RSSGeneratorTest.java | 1 -
.../org/apache/wiki/url/DefaultURLConstructorTest.java | 1 -
.../org/apache/wiki/url/ShortURLConstructorTest.java | 1 -
.../apache/wiki/url/ShortViewURLConstructorTest.java | 1 -
.../src/test/resources/jspwiki-custom.properties | 1 -
.../en/src/main/resources/InstallationTips.txt | 2 +-
.../es/src/main/resources/InstallationTips.txt | 2 +-
.../fr/src/main/resources/InstallationTips.txt | 4 +---
.../it/src/main/resources/InstallationTips.txt | 2 +-
.../nl/src/main/resources/InstallationTips.txt | 2 +-
.../pt_BR/src/main/resources/InstallationTips.txt | 2 +-
.../ru/src/main/resources/InstallationTips.txt | 3 +--
.../zh_CN/src/main/resources/InstallationTips.txt | 4 ++--
26 files changed, 16 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/README
----------------------------------------------------------------------
diff --git a/README b/README
index 21509cc..de834c9 100644
--- a/README
+++ b/README
@@ -96,7 +96,7 @@ default ini/jspwiki.properties file in the JSPWiki JAR. For any values not
placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
Review the default file to look for values you may wish to override in the custom
file. Some common values to override in your custom file include
-jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
jspwiki.fileSystemProvider.pageDir, jspwiki.basicAttachmentProvider.storageDir,
and log4j.appender.FileLog.File. The comments in the default file will suggest
appropriate values to override them with.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9e603c4..b8a88ca 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ default ini/jspwiki.properties file in the JSPWiki JAR. For any values not
placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
Review the default file to look for values you may wish to override in the custom
file. Some common values to override in your custom file include
-jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
jspwiki.fileSystemProvider.pageDir, jspwiki.basicAttachmentProvider.storageDir,
and log4j.appender.FileLog.File. The comments in the default file will suggest
appropriate values to override them with.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
index 09c71cf..57e097c 100644
--- a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
@@ -21,7 +21,6 @@ jspwiki.groupdatabase = ${it-jspwiki.groupdatabase}
jspwiki.referenceStyle = ${it-jspwiki.referenceStyle}
jspwiki.userdatabase = ${it-jspwiki.userdatabase}
-jspwiki.baseURL = http://localhost:8080/${project.artifactId}/
jspwiki.fileSystemProvider.pageDir = ./${project.artifactId}/target/test-classes/test-repo
jspwiki.basicAttachmentProvider.storageDir = ./${project.artifactId}/target/test-classes/test-repo/attachments
jspwiki.workDir = ./${project.artifactId}/target/test-classes/workdir-${project.artifactId}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-portable/src/main/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/main/resources/jspwiki-custom.properties b/jspwiki-portable/src/main/resources/jspwiki-custom.properties
index 12bd191..e9374ab 100644
--- a/jspwiki-portable/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-portable/src/main/resources/jspwiki-custom.properties
@@ -28,7 +28,6 @@ jspwiki.rss.channelDescription = JSPWiki Portable
jspwiki.applicationName=JSPWiki
jspwiki.security=jaas
jspwiki.workDir=./temp/JSPWiki
-jspwiki.baseURL=http://localhost:9627/JSPWiki/
jspwiki.attachment.maxsize=4000000
jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
jspwiki.breakTitleWithSpaces=true
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
index d79343f..0245216 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
@@ -20,7 +20,6 @@
#
jspwiki.applicationName=department
-jspwiki.baseURL=http://localhost:9627/department/
jspwiki.basicAttachmentProvider.storageDir=./data/department
jspwiki.fileSystemProvider.pageDir=./data/department
jspwiki.pageProvider=VersioningFileProvider
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
index 1727c08..0f7993b 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
@@ -20,7 +20,6 @@
#
jspwiki.applicationName=personal
-jspwiki.baseURL=http://localhost:9627/personal/
jspwiki.basicAttachmentProvider.storageDir=./data/personal
jspwiki.fileSystemProvider.pageDir=./data/personal
jspwiki.workDir=./temp/personal
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index afb34f5..6f663b7 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
@@ -145,9 +145,6 @@ public class WikiEngine
Double negative, cause for most servers you don't need the property */
public static final String PROP_NO_FILTER_ENCODING = "jspwiki.nofilterencoding";
- /** The name for the base URL to use in all references. */
- public static final String PROP_BASEURL = "jspwiki.baseURL";
-
/** The name for the property which allows you to set the current reference
* style. The value is {@value}.
*/
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
index 3b289b4..5f3942b 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
@@ -155,25 +155,15 @@ public class RSSGenerator
private static final int MAX_CHARACTERS = Integer.MAX_VALUE-1;
/**
- * Initialize the RSS generator for a given WikiEngine. Currently the only
- * required property is <tt>{@value org.apache.wiki.WikiEngine#PROP_BASEURL}</tt>.
+ * Initialize the RSS generator for a given WikiEngine.
*
* @param engine The WikiEngine.
* @param properties The properties.
- * @throws NoRequiredPropertyException If something is missing from the given property set.
*/
public RSSGenerator( WikiEngine engine, Properties properties )
- throws NoRequiredPropertyException
{
m_engine = engine;
- // FIXME: This assumes a bit too much.
- if( engine.getBaseURL() == null || engine.getBaseURL().length() == 0 )
- {
- throw new NoRequiredPropertyException( "RSS requires jspwiki.baseURL to be set!",
- WikiEngine.PROP_BASEURL );
- }
-
m_channelDescription = properties.getProperty( PROP_CHANNEL_DESCRIPTION,
m_channelDescription );
m_channelLanguage = properties.getProperty( PROP_CHANNEL_LANGUAGE,
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
index 315a23d..f236feb 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
@@ -60,7 +60,6 @@ public class Installer
public static final String INSTALL_ERROR = "Installer.Error";
public static final String INSTALL_WARNING = "Installer.Warning";
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_FILE = "log4j.appender.FileLog.File";
public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
@@ -205,13 +204,7 @@ public class Installer
// Get application name
String nullValue = m_props.getProperty( APP_NAME, rb.getString( "install.installer.default.appname" ) );
parseProperty( APP_NAME, nullValue );
-
- // Get/sanitize base URL
- nullValue = m_request.getRequestURL().toString();
- nullValue = nullValue.substring( 0, nullValue.lastIndexOf('/') )+"/";
- parseProperty( BASE_URL, nullValue );
- sanitizeURL( BASE_URL );
-
+
// Get/sanitize page directory
nullValue = m_props.getProperty( PAGE_DIR, rb.getString( "install.installer.default.pagedir" ) );
parseProperty( PAGE_DIR, nullValue );
@@ -265,7 +258,6 @@ public class Installer
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" ) );
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 80d9b49..59f915e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -142,7 +142,6 @@ public class WikiServletFilter implements Filter
out.print( "<body>" );
out.print( "<h1>JSPWiki installation</h1>" );
out.print( "<p>Hello! It appears that this is your first jspwiki installation." );
- out.print( "(Or, you have removed jspwiki.baseURL from your property file.) " );
out.print( "Therefore, you will need to start the installation process. " );
out.print( "Please <a href='Install.jsp'>continue to the installer</a>." );
out.print( "</p>");
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/resources/CoreResources.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/CoreResources.properties b/jspwiki-war/src/main/resources/CoreResources.properties
index e2be67f..cfb461b 100644
--- a/jspwiki-war/src/main/resources/CoreResources.properties
+++ b/jspwiki-war/src/main/resources/CoreResources.properties
@@ -202,7 +202,6 @@ install.installer.default.appname=MyWiki
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.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/resources/CoreResources_nl.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/CoreResources_nl.properties b/jspwiki-war/src/main/resources/CoreResources_nl.properties
index 7498eac..abfdd8b 100644
--- a/jspwiki-war/src/main/resources/CoreResources_nl.properties
+++ b/jspwiki-war/src/main/resources/CoreResources_nl.properties
@@ -60,7 +60,7 @@ security.error.illegalloginname=Ongeldige Login naam "{0}";
security.error.cannot.rename=Kan niet hernoemen: de Login naam ''{0}'' is al in gebruik.
security.error.fullname.taken=De volledige naam ''{0}'' is al in gebruik.
security.error.login.taken=De Login naam ''{0}'' is al in gebruik.
-security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor \ufffd\ufffdn profile gebruiken.
+security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor \ufffd\ufffdn profile gebruiken.
# These should roughly match whatever is used in default.properties for UserProfile.jsp
security.user.loginname=Login naam
@@ -103,7 +103,7 @@ lostpwd.reset.submit=Herstel wachtwoord!
diff.traditional.added=Op lijn {0} werden {1} toegevoegd
diff.traditional.changed=Op lijn {0} werden {1} gewijzigd
diff.traditional.removed=Op lijn {0} werden {1} verwijderd
-diff.traditional.oneline=\ufffd\ufffdn lijn
+diff.traditional.oneline=\ufffd\ufffdn lijn
diff.traditional.lines={2} lijnen
# InputValidator
@@ -207,7 +207,6 @@ install.installer.props.saved=Je nieuwe properties zijn opgeslagen in {0}. Copy
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.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/main/webapp/rss.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp
index 082ca0f..534d041 100644
--- a/jspwiki-war/src/main/webapp/rss.jsp
+++ b/jspwiki-war/src/main/webapp/rss.jsp
@@ -56,7 +56,7 @@
// Redirect if baseURL not set or RSS generation not on
if( wiki.getBaseURL().length() == 0 )
{
- response.sendError( 500, "The jspwiki.baseURL property has not been defined for this wiki - cannot generate RSS" );
+ response.sendError( 500, "The baseURL could not be determined for this wiki - cannot generate RSS" );
return;
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
index f56a28c..c4607bc 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
@@ -55,7 +55,6 @@ public class RSSGeneratorTest extends TestCase
protected void setUp() throws Exception
{
- props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
CacheManager.getInstance().removeAllCaches();
m_testEngine = new TestEngine(props);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
index fc3df0b..ee3b41f 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
@@ -42,7 +42,6 @@ public class DefaultURLConstructorTest extends TestCase
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
index 5cc7024..1b6b4d2 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
@@ -42,7 +42,6 @@ public class ShortURLConstructorTest extends TestCase
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
index 2a1e1bc..59291c5 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
@@ -42,7 +42,6 @@ public class ShortViewURLConstructorTest extends TestCase
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
- props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
testEngine = new TestEngine(props);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-war/src/test/resources/jspwiki-custom.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/resources/jspwiki-custom.properties b/jspwiki-war/src/test/resources/jspwiki-custom.properties
index 1e1abab..f02e61f 100644
--- a/jspwiki-war/src/test/resources/jspwiki-custom.properties
+++ b/jspwiki-war/src/test/resources/jspwiki-custom.properties
@@ -28,7 +28,6 @@ jspwiki.translatorReader.useOutlinkImage = false
jspwiki.basicAttachmentProvider.storageDir = target/test-classes/testrepository
jspwiki.encoding = ISO-8859-1
jspwiki.filterConfig = /filters.xml
-jspwiki.baseURL = http://localhost/
jspwiki.referenceStyle = relative
jspwiki.authorizer=org.apache.wiki.TestAuthorizer
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
index cc0f02e..02a6501 100644
--- a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ The lower part of the left hand side is similarly called [LeftMenuFooter], and i
!Enabling the [RSS|http://blogspace.com/rss/] feed
-In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true", and also set the "jspwiki.baseURL" to point at your Wiki. Otherwise the RSS generator can't figure out how its links should go... :-)
+In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true".
!I don't like ~ThingsSquashedTogether in the page titles. What can I do?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
index 714a11f..6bf4f86 100644
--- a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ La parte inferior de la secci�n de la izquierda es otra p�gina m�s, llamada [
!Activando el feed [RSS|http://blogspace.com/rss/]
-En tu archivo jspwiki.properties, tienes que establecer el par�metro "jspwiki.rss.generate" a "true", y tambi�n establecer el par�metro "jspwiki.baseURL" para que apunte a tu Wiki. De otro modo el generador de RSS no sabr� a d�nde deben ir los enlaces... :-)
+En tu archivo jspwiki.properties, tienes que establecer el par�metro "jspwiki.rss.generate" a "true".
!No me gusta que ~LasPalabrasSeAmontonenEnLosTitulos en los t�tulos de las p�ginas. �Puedo hacer algo al respecto?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
index b67ea2a..331ef39 100644
--- a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
@@ -73,9 +73,7 @@ et elle est elle aussi totalement �ditable.
!Activer [RSS|http://blogspace.com/rss/]
Dans votre fichier {{jspwiki.properties}}, vous devrez modifier le param�tre
-{{jspwiki.rss.generate}} � la valeur {{true}}. Vous devrez aussi y changer le param�tre
-{{jspwiki.baseURL}} qui donne l'URL compl�te de votre Wiki. Sinon, le g�n�rateur RSS ne
-saura pas vers o� ses liens doivent pointer... :-)
+{{jspwiki.rss.generate}} � la valeur {{true}}.
!Je n'aime pas les ~TitresTousCollesCommeCa. Qu'est-ce que je peux faire ?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
index 9b029b4..ee5c78b 100644
--- a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ Analogamente, la parte bassa del menu sinistro � la pagina [LeftMenuFooter], an
!Abilitare il feed [RSS|http://blogspace.com/rss/]
-Nel file jspwiki.properties, dovete modificare la propriet� "jspwiki.rss.generate" a "true", e anche far si che la propriet� "jspwiki.baseURL" corrisponda al vostro Wiki. Altrimenti il generatore RSS non avr� idea del come costruire i link ... :-)
+Nel file jspwiki.properties, dovete modificare la propriet� "jspwiki.rss.generate" a "true".
!Non mi piace avere cose del tipo ~ThingsSquashedTogether nei titoli delle pagine. E' possibile cambiare questo comportamento?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
index 2023db2..0dc21cd 100644
--- a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
@@ -57,7 +57,7 @@ Het onderste gedeelte van het linker menu is (niet erg verrassend) genaamd [Left
![RSS|http://blogspace.com/rss/] feed aanzetten
-In je jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten, en ook de "jspwiki.baseURL" moet een valide waarde hebben. Anders kan RSS niet weten hoe de links er uit moeten zien....:-)
+In je jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten.
!Ik hou niet van ~DingenAanElkaarGeplakt in de pagina titels. Wat nu?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
index 6cb7265..de5a719 100644
--- a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
@@ -56,7 +56,7 @@ A parte mais baixa deste menu � chamada similarmente de [LeftMenuFooter] (Baixo
!Habilitanto o [RSS|http://blogspace.com/rss/] feed
-No seu arquivo jspwiki.properties, voc� precisar� de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro), e tamb�m precisar� alterar o atributo "jspwiki.baseURL" para apontar para a sua Wiki. Se n�o fizer isso o gerador de RSS n�o conseguir� saber para onde os links devem ir... :-)
+No seu arquivo jspwiki.properties, voc� precisar� de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro).
!Eu n�o gosto que as ~CoisasFiquemJuntas nos t�tulos das p�ginas. O que eu posso fazer?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
index 9177250..07b9b27 100644
--- a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
@@ -63,8 +63,7 @@
! \u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u0430 [RSS|http://blogspace.com/rss/]
-\u0412 \u0412\u0430\u0448\u0435\u043c \u0444\u0430\u0439\u043b\u0435 jspwiki.properties, \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u0443\u0434\u0435\u0442\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c "jspwiki.rss.generate" \u0432 "true",
-\u0438 \u0442\u0430\u043a\u0436\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c "jspwiki.baseURL", \u0447\u0442\u043e\u0431\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043d\u0430 \u0412\u0430\u0448\u0443 Wiki.
+\u0412 \u0412\u0430\u0448\u0435\u043c \u0444\u0430\u0439\u043b\u0435 jspwiki.properties, \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u0443\u0434\u0435\u0442\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c "jspwiki.rss.generate" \u0432 "true".
\u0418\u043d\u0430\u0447\u0435 \u0433\u0435\u043d\u0435\u0440\u0430\u0442\u043e\u0440 RSS \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u044f\u0441\u043d\u0438\u0442\u044c, \u043a\u0430\u043a \u0435\u0433\u043e \u0441\u0441\u044b\u043b\u043a\u0438 \u0434\u043e\u043b\u0436\u043d\u044b \u043f\u043e\u0439\u0442\u0438... :-)
! \u041c\u043d\u0435 \u043d\u0435 \u043d\u0440\u0430\u0432\u0438\u0442\u0441\u044f ~ThingsSquashedTogether \u0432 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f\u0445 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b. \u0427\u0442\u043e \u044f \u043c\u043e\u0433\u0443 \u0441\u0434\u0435\u043b\u0430\u0442\u044c?
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/41bb9760/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
----------------------------------------------------------------------
diff --git a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
index d40ddc1..ab973af 100644
--- a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
@@ -57,8 +57,8 @@
!\u542f\u7528 [RSS|http://blogspace.com/rss/] \u8ba2\u9605
-\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\uff0c\u60a8\u9700\u8981\u5c06 "jspwiki.rss.generate" \u8bbe\u7f6e\u4e3a "true"\uff0c\u53e6\u5916\u4e5f\u9700\u8981\u8bbe\u7f6e "jspwiki.baseURL" \u4f7f\u5176\u6307\u5411\u60a8\u7684Wiki \u7cfb\u7edf\u3002\u5426\u5219\uff0cRSS \u751f\u6210\u7a0b\u5e8f\u6ca1\u6cd5\u77e5\u9053\u5b83\u7684\u94fe\u63a5\u5e94\u8be5\u6307\u5411\u4f55\u5904\u2026\u2026
+\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\uff0c\u60a8\u9700\u8981\u5c06 "jspwiki.rss.generate" \u8bbe\u7f6e\u4e3a "true".
!\u6211\u4e0d\u559c\u6b22\u9875\u9762\u6807\u9898\u4e2d\u7684 ~ThingsSquashedTogether\uff0c\u600e\u4e48\u529e\uff1f
-\u6b63\u5982 Finns \u6240\u8bf4\uff0c"voe tokkiinsa"\uff0c\u610f\u4e3a\u201c\u662f\u7684\uff0c\u5f53\u7136\u201d\u3002\u60a8\u53ea\u9700\u8981\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\u5c06 "jspwiki.breakTitleWithSpaces" \u5c5e\u6027\u8bbe\u7f6e\u4e3a "true"\u3002
\ No newline at end of file
+\u6b63\u5982 Finns \u6240\u8bf4\uff0c"voe tokkiinsa"\uff0c\u610f\u4e3a\u201c\u662f\u7684\uff0c\u5f53\u7136\u201d\u3002\u60a8\u53ea\u9700\u8981\u5728 jspwiki.properties \u6587\u4ef6\u4e2d\u5c06 "jspwiki.breakTitleWithSpaces" \u5c5e\u6027\u8bbe\u7f6e\u4e3a "true"\u3002