5 a.m.
Author: shane.bryzak(a)jboss.com
Date: 2009-04-21 06:00:14 -0400 (Tue, 21 Apr 2009)
New Revision: 10545
Modified:
modules/trunk/security/pom.xml
modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java
modules/trunk/version-matrix/pom.xml
Log:
fix logging
Modified: modules/trunk/security/pom.xml
===================================================================
--- modules/trunk/security/pom.xml 2009-04-21 09:40:40 UTC (rev 10544)
+++ modules/trunk/security/pom.xml 2009-04-21 10:00:14 UTC (rev 10545)
@@ -19,7 +19,10 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-logging</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-04-21
09:40:40 UTC (rev 10544)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-04-21
10:00:14 UTC (rev 10545)
@@ -9,9 +9,6 @@
import java.util.List;
import javax.annotation.Named;
-import javax.context.Context;
-import javax.context.ContextNotActiveException;
-import javax.context.RequestScoped;
import javax.context.SessionScoped;
import javax.inject.Current;
import javax.inject.Initializer;
@@ -20,6 +17,8 @@
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.security.events.AlreadyLoggedInEvent;
import org.jboss.seam.security.events.LoggedInEvent;
import org.jboss.seam.security.events.LoggedOutEvent;
@@ -42,37 +41,23 @@
{
private static final long serialVersionUID = 3751659008033189259L;
- // Event keys
- public static final String EVENT_LOGIN_SUCCESSFUL =
"org.jboss.seam.security.loginSuccessful";
- public static final String EVENT_LOGIN_FAILED =
"org.jboss.seam.security.loginFailed";
- public static final String EVENT_NOT_LOGGED_IN =
"org.jboss.seam.security.notLoggedIn";
- public static final String EVENT_NOT_AUTHORIZED =
"org.jboss.seam.security.notAuthorized";
- public static final String EVENT_PRE_AUTHENTICATE =
"org.jboss.seam.security.preAuthenticate";
- public static final String EVENT_POST_AUTHENTICATE =
"org.jboss.seam.security.postAuthenticate";
- public static final String EVENT_LOGGED_OUT =
"org.jboss.seam.security.loggedOut";
- public static final String EVENT_ALREADY_LOGGED_IN =
"org.jboss.seam.security.alreadyLoggedIn";
- public static final String EVENT_QUIET_LOGIN =
"org.jboss.seam.security.quietLogin";
-
protected static boolean securityEnabled = true;
public static final String ROLES_GROUP = "Roles";
private static final LogProvider log = Logging.getLogProvider(Identity.class);
-
- private Principal principal;
- private Subject subject;
-
+
@Current private Manager manager;
@Current private Credentials credentials;
- @Current private RememberMe rememberMe;
@Current private PermissionMapper permissionMapper;
- private transient ThreadLocal<Boolean> systemOp;
+ private Principal principal;
+ private Subject subject;
+ private String jaasConfigName = null;
+ private List<String> preAuthenticationRoles = new ArrayList<String>();
- private String jaasConfigName = null;
+ private transient ThreadLocal<Boolean> systemOp;
- private List<String> preAuthenticationRoles = new ArrayList<String>();
-
/**
* Flag that indicates we are in the process of authenticating
*/
Modified: modules/trunk/version-matrix/pom.xml
===================================================================
--- modules/trunk/version-matrix/pom.xml 2009-04-21 09:40:40 UTC (rev 10544)
+++ modules/trunk/version-matrix/pom.xml 2009-04-21 10:00:14 UTC (rev 10545)
@@ -141,6 +141,18 @@
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-logging</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>