You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/01/13 18:52:15 UTC
svn commit: r734197 - in /incubator/jspwiki/trunk: ChangeLog
src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
Author: metskem
Date: Tue Jan 13 09:52:04 2009
New Revision: 734197
URL: http://svn.apache.org/viewvc?rev=734197&view=rev
Log:
3.0.0-svn-51 JSPWIKI-468, remove keystore check from SecurityVerifier
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=734197&r1=734196&r2=734197&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Jan 13 09:52:04 2009
@@ -1,4 +1,10 @@
-202009-01-13 Andrew Jaquith <ajaquith AT apache DOT org>
+2009-01-13 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-51
+
+ * JSPWIKI-468, remove keystore check from SecurityVerifier
+
+2009-01-13 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-50
@@ -11,7 +17,7 @@
* Fixed b0rked jspwiki.css.
-09-01-12 Florian Holeczek <fl...@apache.org>
+2009-01-12 Florian Holeczek <fl...@apache.org>
* 3.0.0-svn-49
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=734197&r1=734196&r2=734197&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Tue Jan 13 09:52:04 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "50";
+ public static final String BUILD = "51";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java?rev=734197&r1=734196&r2=734197&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java Tue Jan 13 09:52:04 2009
@@ -731,20 +731,6 @@
PolicyReader policy = new PolicyReader( policyFile );
m_session.addMessage( INFO_POLICY, "The security policy '" + policy.getFile() + "' exists." );
- // See if there is a keystore that's valid
- KeyStore ks = policy.getKeyStore();
- if ( ks == null )
- {
- m_session.addMessage( WARNING_POLICY,
- "Policy file does not have a keystore... at least not one that we can locate. If your policy file " +
- "does not contain any 'signedBy' blocks, this is probably ok." );
- }
- else
- {
- m_session.addMessage( INFO_POLICY,
- "The security policy specifies a keystore, and we were able to locate it in the filesystem." );
- }
-
// Verify the file
policy.read();
List<Exception> errors = policy.getMessages();