jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject [5/5] jspwiki git commit: removed almost all occurrences of baseURL where not appropriate anymore fixed Installer and RSS
Date Mon, 26 Dec 2016 12:44:04 GMT
removed almost all occurrences of baseURL where not appropriate anymore
fixed Installer and RSS


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/08573754
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/08573754
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/08573754

Branch: refs/heads/JSPWIKI-1035
Commit: 08573754a09625727775725ebaed6b65c34172a9
Parents: 72e1ace
Author: Harry Metske <harry.metske@gmail.com>
Authored: Mon Dec 26 13:43:50 2016 +0100
Committer: Harry Metske <harry.metske@gmail.com>
Committed: Mon Dec 26 13:43:50 2016 +0100

----------------------------------------------------------------------
 README                                                  |  2 +-
 .../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       |  5 +----
 .../src/main/java/org/apache/wiki/rss/RSSGenerator.java | 12 ++----------
 .../src/main/java/org/apache/wiki/tags/BaseURLTag.java  |  2 +-
 .../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/resources/ini/jspwiki.properties   |  6 ++----
 jspwiki-war/src/main/webapp/Install.jsp                 | 11 ++---------
 jspwiki-war/src/main/webapp/rss.jsp                     | 11 +++--------
 .../test/java/org/apache/wiki/rss/RSSGeneratorTest.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          |  2 --
 .../zh_CN/src/main/resources/InstallationTips.txt       |  4 ++--
 24 files changed, 23 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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/08573754/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/08573754/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/08573754/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/08573754/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..e64b1ad 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}.
      */
@@ -2229,7 +2226,7 @@ public class WikiEngine
     {
         if( m_rssGenerator != null && m_rssGenerator.isEnabled() )
         {
-            return getBaseURL()+m_rssFile;
+            return getBaseURL()+ "/" + m_rssFile;
         }
 
         return null;

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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..33bba9d 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,9 +155,8 @@ 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.
@@ -167,13 +166,6 @@ public class RSSGenerator
     {
         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/08573754/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java b/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
index 4b3c15f..0e03b0e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
@@ -21,7 +21,7 @@ package org.apache.wiki.tags;
 import java.io.IOException;
 
 /**
- *  Writes the jspwiki.baseURL property.
+ *  Writes the jspwiki baseURL.
  *
  *  @since 2.2
  */

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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/08573754/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/08573754/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/08573754/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 ��n profile gebruiken.
+security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres
maar voor ��n 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=��n lijn
+diff.traditional.oneline=��n 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/08573754/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index 589cc8b..1c3fc7c 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -195,10 +195,8 @@ jspwiki.attachmentProvider = BasicAttachmentProvider
 #
 jspwiki.diffProvider = TraditionalDiffProvider
 
-#  Determines if you need to have relative urls or not.  If the baseURL
-#  is not set, then this has no effect, but if you set the baseURL (which
-#  is highly recommended), you can use this to set relative urls.
-#
+#  Determines if you need to have relative urls or not.
+
 #  Possible values are "absolute" and "relative".
 #
 #jspwiki.referenceStyle=relative

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/jspwiki-war/src/main/webapp/Install.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp
index 6d58bc4..050b787 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -118,13 +118,6 @@ if ( !installer.adminExists() )
       <fmt:message key="install.jsp.basics.appname.desc"/>
     </div>
 
-    <label class="control-label" ><fmt:message key="install.jsp.basics.baseurl.label"
/>
-    <input class="form-control" type="url" name="<%=Installer.BASE_URL%>" size="40"
value="<%=installer.getProperty( Installer.BASE_URL )%>"/>
-    </label>
-    <div class="help-block">
-      <fmt:message key="install.jsp.basics.baseurl.desc" />
-    </div>
-
     <label class="control-label" ><fmt:message key="install.jsp.basics.page.storage.label"
/>
     <input class="form-control" type="text" name="<%=Installer.PAGE_DIR%>" size="40"
value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/>
     </label>
@@ -164,14 +157,14 @@ if ( !installer.adminExists() )
   <h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
 
     <label class="control-label" ><fmt:message key="install.jsp.adv.settings.logfile.label"
/>
-    <input class="form-control" type="url" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty(
Installer.LOG_FILE )%>" size="40"/>
+    <input class="form-control" type="text" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty(
Installer.LOG_FILE )%>" size="40"/>
     </label>
     <div class="help-block">
       <fmt:message key="install.jsp.adv.settings.logfile.desc" />
     </div> <br/>
 
     <label class="control-label" ><fmt:message key="install.jsp.adv.settings.workdir.label"
/>
-    <input class="form-control" type="url" name="<%=Installer.WORK_DIR%>" size="40"
value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
+    <input class="form-control" type="text" name="<%=Installer.WORK_DIR%>" size="40"
value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
     </label>
     <div class="help-block">
       <fmt:message key="install.jsp.adv.settings.workdir.desc" />

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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..9912b3c 100644
--- a/jspwiki-war/src/main/webapp/rss.jsp
+++ b/jspwiki-war/src/main/webapp/rss.jsp
@@ -53,13 +53,8 @@
     if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
     WikiPage    wikipage    = wikiContext.getPage();
 
-    // 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" );
-        return;
-    }
-    
+    // Redirect if RSS generation not on
+
     if( wiki.getRSSGenerator() == null )
     {
         response.sendError( 404, "RSS feeds are disabled at administrator request" );
@@ -106,7 +101,7 @@
     if( mode.equals("blog") )
     {
         org.apache.wiki.plugin.WeblogPlugin plug = new org.apache.wiki.plugin.WeblogPlugin();
-        changed = plug.findBlogEntries(wiki.getPageManager(), 
+        changed = plug.findBlogEntries(wiki,
                                        wikipage.getName(),
                                        new Date(0L),
                                        new Date());

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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 2fc1864..3be134c 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/08573754/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/08573754/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/08573754/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/08573754/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/08573754/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/08573754/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/08573754/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/08573754/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..b15164b 100644
--- a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
@@ -64,8 +64,6 @@
 ! Разрешение канала [RSS|http://blogspace.com/rss/]
 
 В Вашем файле jspwiki.properties, Вы должны будете установить
"jspwiki.rss.generate" в "true",
-и также установить "jspwiki.baseURL", чтобы указать на Вашу
Wiki.
-Иначе генератор RSS не может выяснить, как его ссылки
должны пойти... :-)
 
 ! Мне не нравится ~ThingsSquashedTogether в названиях страницы.
Что я могу сделать?
 

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/08573754/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..8952987 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 @@
 
 !启用 [RSS|http://blogspace.com/rss/] 订阅
 
-在 jspwiki.properties 文件中,您需要将 "jspwiki.rss.generate" 设置为 "true",另外也需要设置
"jspwiki.baseURL" 使其指向您的Wiki 系统。否则,RSS 生成程序没法知道它的链接应该指向何处……
+在 jspwiki.properties 文件中,您需要将 "jspwiki.rss.generate" 设置为 "true",
 
 !我不喜欢页面标题中的 ~ThingsSquashedTogether,怎么办?
 
-正如 Finns 所说,"voe tokkiinsa",意为“是的,当然”。您只需要在 jspwiki.properties
文件中将 "jspwiki.breakTitleWithSpaces" 属性设置为 "true"。
\ No newline at end of file
+正如 Finns 所说,"voe tokkiinsa",意为“是的,当然”。您只需要在 jspwiki.properties
文件中将 "jspwiki.breakTitleWithSpaces" 属性设置为 "true"。


Mime
View raw message