You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/04/01 05:45:10 UTC
svn commit: r643257 -
/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
Author: ajaquith
Date: Mon Mar 31 20:45:09 2008
New Revision: 643257
URL: http://svn.apache.org/viewvc?rev=643257&view=rev
Log:
Re-factored the authentication subsystem to remove the need for JAAS configuration files. WEB-INF/jspwiki.jaas goes away, as does the need for PolicyLoader. Also, responsibilities for web authentication move to WikiServletFilter. Authentication is now configured via jspwiki.properties -- see that file for details. WikiSession API change: getLoginContext() vanishes.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java?rev=643257&r1=643256&r2=643257&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java Mon Mar 31 20:45:09 2008
@@ -1,21 +1,22 @@
-/*
+/*
JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2002 Janne Jalkanen (Janne.Jalkanen@iki.fi)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
package com.ecyrd.jspwiki.event;
@@ -89,6 +90,9 @@
/** When a user logs out. */
public static final int LOGOUT = 44;
+ /** When a Principal should be added to the WikiSession */
+ public static final int PRINCIPAL_ADD = 35;
+
/** When a session expires. */
public static final int SESSION_EXPIRED = 45;
@@ -234,6 +238,7 @@
case LOGIN_CREDENTIAL_EXPIRED: return "LOGIN_ACCOUNT_EXPIRED";
case LOGIN_FAILED: return "LOGIN_FAILED";
case LOGOUT: return "LOGOUT";
+ case PRINCIPAL_ADD: return "PRINCIPAL_ADD";
case SESSION_EXPIRED: return "SESSION_EXPIRED";
case GROUP_ADD: return "GROUP_ADD";
case GROUP_REMOVE: return "GROUP_REMOVE";
@@ -260,6 +265,7 @@
case LOGIN_CREDENTIAL_EXPIRED: return "login failed: credential expired";
case LOGIN_FAILED: return "login failed";
case LOGOUT: return "user logged out";
+ case PRINCIPAL_ADD: return "new principal added";
case SESSION_EXPIRED: return "session expired";
case GROUP_ADD: return "new group added";
case GROUP_REMOVE: return "group removed";