Author: metskem
Date: Sun Sep 18 12:06:35 2011
New Revision: 1172264
URL: http://svn.apache.org/viewvc?rev=1172264&view=rev
Log:
2011-09-18 Harry Metske <[email protected]>
* 3.0.0-svn-232
* fixed JSPWIKI-705 (Log a clear hint to a running security manager).
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1172264&r1=1172263&r2=1172264&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Sep 18 12:06:35 2011
@@ -1,3 +1,9 @@
+2011-09-18 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-232
+
+ * fixed JSPWIKI-705 (Log a clear hint to a running security manager).
+
2011-08-21 Florian Holeczek <[email protected]>
* fixed JSPWIKI-701 (Website must display disclaimer text)
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=1172264&r1=1172263&r2=1172264&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Sep 18
12:06:35 2011
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "231";
+ public static final String BUILD = "232";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java?rev=1172264&r1=1172263&r2=1172264&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java
Sun Sep 18 12:06:35 2011
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
+import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
import org.apache.wiki.action.WikiContextFactory;
@@ -51,6 +52,15 @@ import org.apache.wiki.ui.TemplateManage
*/
public class SessionMonitor implements HttpSessionListener,
ServletContextListener, WikiEventListener
{
+ static
+ {
+ // check for security manager active (JSPWiki does not run if a
security manager is active)
+ if( System.getSecurityManager() != null )
+ {
+ throw new InternalWikiException( "FATAL ERROR: An active Java
Security Manager was found, JSPWiki will not work !!" );
+ }
+ }
+
private static Logger log = LoggerFactory.getLogger( SessionMonitor.class
);
/** Map with WikiEngines as keys, and SessionMonitors as values. */
