[seam-commits] Seam SVN: r7301 - trunk/src/main/org/jboss/seam/security.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-01-29 23:45:31 -0500 (Tue, 29 Jan 2008)
New Revision: 7301

Modified:
   trunk/src/main/org/jboss/seam/security/Identity.java
Log:
JBSEAM-2271 removed deprecated security events

Modified: trunk/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Identity.java	2008-01-30 04:39:11 UTC (rev 7300)
+++ trunk/src/main/org/jboss/seam/security/Identity.java	2008-01-30 04:45:31 UTC (rev 7301)
@@ -180,10 +180,7 @@
       if ( !evaluateExpression(expr) )
       {
          if ( !isLoggedIn() )
-         {
-//          TODO - Deprecated, remove for next major release
-            if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");            
-            
+         {           
             if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
             log.debug(String.format(
                "Error evaluating expression [%s] - User not logged in", expr));
@@ -208,9 +205,6 @@
             log.debug("Login successful for: " + getUsername());
          }
 
-//       TODO - Deprecated, remove for next major release
-         if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.loginSuccessful");
-         
          if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
          return "loggedIn";
       }
@@ -270,9 +264,6 @@
       unAuthenticate();
       preAuthenticationRoles.clear();
       
-      // TODO - Deprecated, remove for next major release
-      if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.preAuthenticate");      
-      
       if (Events.exists()) Events.instance().raiseEvent(EVENT_PRE_AUTHENTICATE);
    }   
    
@@ -302,9 +293,6 @@
       
       password = null;
 
-      // TODO - Deprecated, remove for next major release
-      if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.postAuthenticate");
-      
       if (Events.exists()) Events.instance().raiseEvent(EVENT_POST_AUTHENTICATE, this);
    }
    
@@ -344,10 +332,7 @@
       principal = null;
       unAuthenticate();
       Session.instance().invalidate();
-      if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT);
-      
-      // TODO - Deprecated, remove for next major release
-      if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.loggedOut");      
+      if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT);      
    }
 
    /**
@@ -443,10 +428,7 @@
       if ( !hasRole(role) )
       {
          if ( !isLoggedIn() )
-         {
-            // TODO - Deprecated, remove for next major release
-            if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");
-            
+         {           
             if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
             throw new NotLoggedInException();
          }
@@ -475,9 +457,6 @@
       {
          if ( !isLoggedIn() )
          {
-//          TODO - Deprecated, remove for next major release
-            if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");            
-            
             if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
             throw new NotLoggedInException();
          }