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 2011/09/20 18:29:40 UTC
svn commit: r1173227 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/auth/SessionMonitor.java
src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
Author: metskem
Date: Tue Sep 20 16:29:40 2011
New Revision: 1173227
URL: http://svn.apache.org/viewvc?rev=1173227&view=rev
Log:
2011-09-20 Harry Metske <me...@apache.org>
* 2.8.5-svn-9
* moved security manager check for JSPWIKI-705 from SessionMonitor to WikiServletFilter, and
make it a log message instead of an exception.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=1173227&r1=1173226&r2=1173227&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Tue Sep 20 16:29:40 2011
@@ -1,3 +1,10 @@
+2011-09-20 Harry Metske <me...@apache.org>
+
+ * 2.8.5-svn-9
+
+ * moved security manager check for JSPWIKI-705 from SessionMonitor to WikiServletFilter, and
+ make it a log message instead of an exception.
+
2011-09-18 Harry Metske <me...@apache.org>
* 2.8.5-svn-8
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=1173227&r1=1173226&r2=1173227&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Tue Sep 20 16:29:40 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 = "8";
+ public static final String BUILD = "9";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java?rev=1173227&r1=1173226&r2=1173227&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java Tue Sep 20 16:29:40 2011
@@ -46,15 +46,6 @@ import com.ecyrd.jspwiki.rpc.json.JSONRP
*/
public class SessionMonitor implements HttpSessionListener
{
- static
- {
- // check for security manager active (JSPWiki does not run if a security manager is active)
- if( System.getSecurityManager() != null )
- {
- throw new RuntimeException( "FATAL ERROR: An active Java Security Manager was found, JSPWiki will not work !!" );
- }
- }
-
private static Logger log = Logger.getLogger( SessionMonitor.class );
/** Map with WikiEngines as keys, and SessionMonitors as values. */
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java?rev=1173227&r1=1173226&r2=1173227&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java Tue Sep 20 16:29:40 2011
@@ -76,6 +76,14 @@ public class WikiServletFilter implement
public void init( FilterConfig config ) throws ServletException
{
ServletContext context = config.getServletContext();
+ System.out.println( "\n " + System.currentTimeMillis() + " wikiservletfilter init() \n" );
+
+ // TODO REMOVEME when resolving JSPWIKI-129
+ if( System.getSecurityManager() != null )
+ {
+ context
+ .log( "== JSPWIKI WARNING == : This container is running with a security manager. JSPWiki does not yet really support that right now. See issue JSPWIKI-129 for details and information on how to proceed." );
+ }
m_engine = WikiEngine.getInstance( context, null );
}