jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r719669 - in /incubator/jspwiki/trunk: ChangeLog build.properties src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/ui/Installer.java src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
Date Fri, 21 Nov 2008 18:33:50 GMT
Author: metskem
Date: Fri Nov 21 10:33:50 2008
New Revision: 719669

URL: http://svn.apache.org/viewvc?rev=719669&view=rev
Log:
3.0.0-svn-12 JSPWIKI-440: Allow installation of JSPWiki as war file.  * JSPWIKI-424 The famous
trailing slash in baseURL

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.properties
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=719669&r1=719668&r2=719669&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Nov 21 10:33:50 2008
@@ -1,5 +1,17 @@
 2008-11-21 Harry Metske <metskem@apache.org>
 
+        * 3.0.0-svn-12
+        
+        * JSPWIKI-440: Plesk installation of war files.
+        JSPWiki (in most cases) fails to install from an unmodified download because
+        the pageDir points to a directory that cannot be created, changed a couple of default
+        values in build.properties.
+        
+        * JSPWIKI-424 The famous trailing slash in baseURL
+        Now also fixed in Installer and DefaultURLConstructor.
+        
+2008-11-21 Harry Metske <metskem@apache.org>
+
         * 3.0.0-svn-11
         
         * JSPWIKI-407: applied zh_CN patch from Hubert Chang

Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=719669&r1=719668&r2=719669&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Fri Nov 21 10:33:50 2008
@@ -7,10 +7,10 @@
 #  jspwiki.properties-file when it is run.
 #
 @appname@=JSPWiki
-@pagedir@=/p/web/www-data/jspwiki/
-@logfile@=/tmp/jspwiki.log
-@securitylog@=/tmp/security.log
-@spamlog@=/tmp/spamlog.log
+@pagedir@=/tmp/jspwiki/wikipages
+@logfile@=/tmp/jspwiki/logs/jspwiki.log
+@securitylog@=/tmp/jspwiki/logs/security.log
+@spamlog@=/tmp/jspwiki/logs/spamlog.log
 
 @tests.pagedir@=/tmp/testrepository
 @tests.workdir@=/tmp/testworkdir
@@ -52,9 +52,10 @@
 #
 
 #  Which browser to use?
-webtests.browser=*safari
+#webtests.browser=*safari
 #  if you run firefox, and it is not in your PATH, you can specify this :
 #webtests.browser=*firefox /usr/lib/firefox/firefox-2-bin
+webtests.browser=*firefox /media/disk-1/usr/lib/firefox/firefox-2-bin
 
 # For generating API diffs (you must have DependencyFinder installed)
 #dependencyfinder.dir=../lib/DependencyFinder

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=719669&r1=719668&r2=719669&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Fri Nov 21 10:33:50 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "11";
+    public static final String     BUILD         = "12";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java?rev=719669&r1=719668&r2=719669&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java Fri Nov 21 10:33:50 2008
@@ -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/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java?rev=719669&r1=719668&r2=719669&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java Fri Nov 21
10:33:50 2008
@@ -82,7 +82,7 @@
             }
             catch( MalformedURLException e )
             {
-                m_pathPrefix = "/JSPWiki"; // Just a guess.
+                m_pathPrefix = "/JSPWiki/"; // Just a guess.
             }
         }
     }



Mime
View raw message