jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r893583 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/WikiEngine.java src/com/ecyrd/jspwiki/ui/Installer.java src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
Date Wed, 23 Dec 2009 17:37:48 GMT
Author: metskem
Date: Wed Dec 23 17:37:38 2009
New Revision: 893583

URL: http://svn.apache.org/viewvc?rev=893583&view=rev
Log:
2.8.4-svn-6 JSPWIKI-621: check last fileseparator on config page, duplicate of JSPWIKI-424,
reported by Rolf Schumacher. 

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=893583&r1=893582&r2=893583&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Wed Dec 23 17:37:38 2009
@@ -1,3 +1,10 @@
+2009-12-23 Harry Metske <metskem@apache.org>
+
+        * 2.8.4-svn-6
+        
+         * JSPWIKI-621: check last fileseparator on config page, duplicate of JSPWIKI-424,
+            reported by Rolf Schumacher. 
+
 2009-12-15 Harry Metske <metskem@apache.org>
 
         * 2.8.4-svn-5

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=893583&r1=893582&r2=893583&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Wed Dec
23 17:37:38 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "5";
+    public static final String     BUILD         = "6";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java?rev=893583&r1=893582&r2=893583&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java Wed
Dec 23 17:37:38 2009
@@ -502,8 +502,11 @@
                                                         m_saveUserInfo );
 
         m_useUTF8        = "UTF-8".equals( TextUtil.getStringProperty( props, PROP_ENCODING,
"ISO-8859-1" ) );
-        m_baseURL        = TextUtil.getStringProperty( props, PROP_BASEURL, "" );
-
+        m_baseURL = TextUtil.getStringProperty(props, PROP_BASEURL, "");
+        if (!m_baseURL.endsWith("/"))
+        {
+            m_baseURL = m_baseURL + "/";
+        }
 
         m_beautifyTitle  = TextUtil.getBooleanProperty( props,
                                                         PROP_BEAUTIFYTITLE,

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java?rev=893583&r1=893582&r2=893583&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
Wed Dec 23 17:37:38 2009
@@ -223,7 +223,6 @@
         // Get/sanitize base URL
         nullValue = m_request.getRequestURL().toString();
         nullValue = nullValue.substring( 0, nullValue.lastIndexOf('/') )+"/";
-        nullValue = m_props.getProperty( BASE_URL, nullValue );
         parseProperty( BASE_URL, nullValue );
         sanitizeURL( BASE_URL );
         
@@ -343,6 +342,10 @@
         String s = m_props.getProperty( key );
         s = TextUtil.replaceString( s, "\\", "/" );
         s = s.trim();
+        if (!s.endsWith("/"))
+        {
+            s = s + "/";
+        }
         m_props.put( key, s );
     }
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java?rev=893583&r1=893582&r2=893583&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
Wed Dec 23 17:37:38 2009
@@ -82,7 +82,7 @@
             }
             catch( MalformedURLException e )
             {
-                m_pathPrefix = "/JSPWiki"; // Just a guess.
+                m_pathPrefix = "/JSPWiki/"; // Just a guess.
             }
         }
     }



Mime
View raw message