jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1636681 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
Date Tue, 04 Nov 2014 18:33:11 GMT
Author: metskem
Date: Tue Nov  4 18:33:10 2014
New Revision: 1636681

URL: http://svn.apache.org/r1636681
Log:
2014-09-21  Harry Metske (metskem@apache.org)

       * 2.10.2-svn-7

       * Fixed JSPWIKI-856 - Enhance FileSystemProvider to be able to save page attributes
as properties, provided by David Vittor

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/auth/AuthorizationManager.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1636681&r1=1636680&r2=1636681&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Nov  4 18:33:10 2014
@@ -1,3 +1,9 @@
+2014-11-04  Harry Metske (metskem@apache.org)
+
+       * 2.10.2-svn-8
+
+       * Fixed JSPWIKI-870 - JSPWiki does not start, if tomcat directory path contains a
white space.
+
 2014-09-21  Harry Metske (metskem@apache.org)
 
        * 2.10.2-svn-7

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=1636681&r1=1636680&r2=1636681&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 Tue Nov  4 18:33:10
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         = "7";
+    public static final String     BUILD         = "8";
 
     /**
      *  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/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java?rev=1636681&r1=1636680&r2=1636681&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
Tue Nov  4 18:33:10 2014
@@ -477,7 +477,7 @@ public class AuthorizationManager {
             
             if (policyURL != null) 
             {
-                File policyFile = new File( policyURL.getPath() );
+                File policyFile = new File( policyURL.toURI().getPath() );
                 log.info("We found security policy URL: " + policyURL + " and transformed
it to file " + policyFile.getAbsolutePath());
                 m_localPolicy = new LocalPolicy( policyFile, engine.getContentEncoding()
);
                 m_localPolicy.refresh();
@@ -495,7 +495,7 @@ public class AuthorizationManager {
                 throw wse;
             }
         }
-        catch ( PolicyException e )
+        catch ( Exception e)
         {
             log.error("Could not initialize local security policy: " + e.getMessage() );
             throw new WikiException( "Could not initialize local security policy: " + e.getMessage(),
e );



Mime
View raw message