svn commit: r1552995 - in /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki: auth/AuthenticationManager.java providers/VersioningFileProvider.java

[metskem]

Author: metskem
Date: Sun Dec 22 13:42:49 2013
New Revision: 1552995

URL: http://svn.apache.org/r1552995
Log:
* fix loading a custom jspwiki.policy.file from classpath (put your custom 
policy in tomcat/lib, so you dont need war surgery)
* get rid of some warnings in VersioningFileProvider

Modified:
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java?rev=1552995&r1=1552994&r2=1552995&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
 Sun Dec 22 13:42:49 2013
@@ -635,7 +635,7 @@ public class AuthenticationManager {
             {
                 //  create a tmp file of the policy loaded as an InputStream 
and return the URL to it
                 //  
-                InputStream is = 
engine.getServletContext().getResourceAsStream( name );
+                InputStream is = 
AuthenticationManager.class.getResourceAsStream( "/" + name );
                 File tmpFile = File.createTempFile( "temp." + name, "" );
                 tmpFile.deleteOnExit();
 
@@ -660,7 +660,7 @@ public class AuthenticationManager {
             }
             catch (IOException e)
             {
-               log.error("failed to load security policy from " + name + 
",stacktrace follows", e);
+               log.error("failed to load security policy from file " + name + 
",stacktrace follows", e);
             }
         }
         return path;

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java?rev=1552995&r1=1552994&r2=1552995&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
 Sun Dec 22 13:42:49 2013
@@ -161,7 +161,6 @@ public class VersioningFileProvider
     }
 */
     private int findLatestVersion( String page )
-        throws ProviderException
     {
         int version = -1;
         
@@ -598,12 +597,8 @@ public class VersioningFileProvider
 
         File file = new File( dir, version+FILE_EXT );
 
-        if( file.exists() )
-        {
-            return true;
-        }
-        
-        return false;
+        return file.exists();
+
     }
 
     /**
@@ -699,7 +694,7 @@ public class VersioningFileProvider
             catch( IOException e )
             {
                 log.error("Unable to modify page properties",e);
-                throw new ProviderException("Could not modify page 
properties");
+                throw new ProviderException("Could not modify page properties: 
" + e.getMessage());
             }
 
             // We can let the FileSystemProvider take care