[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security/authenticator ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/03 20:21:52

  Modified:    src/main/org/jboss/seam/security/authenticator  
                        Authenticator.java ProviderAuthenticator.java
  Log:
  Authentication superseded by Identity
  
  Revision  Changes    Path
  1.15      +9 -9      jboss-seam/src/main/org/jboss/seam/security/authenticator/Authenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Authenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/authenticator/Authenticator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Authenticator.java	24 Nov 2006 23:15:19 -0000	1.14
  +++ Authenticator.java	4 Dec 2006 01:21:52 -0000	1.15
  @@ -11,7 +11,7 @@
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.security.Authentication;
  +import org.jboss.seam.security.Identity;
   import org.jboss.seam.security.AuthenticationException;
   import org.jboss.seam.security.UsernamePasswordToken;
   import org.jboss.seam.security.adapter.AuthenticationAdapter;
  @@ -45,26 +45,26 @@
       return instance;
     }
   
  -  public Authentication authenticate(String username, String password)
  +  public Identity authenticate(String username, String password)
         throws AuthenticationException
     {
       return authenticate(new UsernamePasswordToken(username, password));
     }
   
  -  public final Authentication authenticate(Authentication authentication)
  +  public final Identity authenticate(Identity ident)
         throws AuthenticationException
     {
  -    Authentication auth = doAuthentication(authentication);
  -    Contexts.getSessionContext().set(Seam.getComponentName(Authentication.class), auth);
  +    Identity auth = doAuthentication(ident);
  +    Contexts.getSessionContext().set(Seam.getComponentName(Identity.class), auth);
       return auth;
     }
   
  -  public abstract Authentication doAuthentication(Authentication authentication)
  +  public abstract Identity doAuthentication(Identity ident)
         throws AuthenticationException;
   
     public void unauthenticateSession()
     {
  -    Authentication.instance().invalidate();
  +    Identity.instance().invalidate();
     }
   
     public void setAdapters(List<String> adapterNames)
  @@ -96,7 +96,7 @@
         adapter.endRequest();
       }
   
  -    if (!Authentication.instance().isValid())
  -      Contexts.getSessionContext().remove(Seam.getComponentName(Authentication.class));
  +    if (!Identity.instance().isValid())
  +      Contexts.getSessionContext().remove(Seam.getComponentName(Identity.class));
     }
   }
  
  
  
  1.11      +3 -3      jboss-seam/src/main/org/jboss/seam/security/authenticator/ProviderAuthenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProviderAuthenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/authenticator/ProviderAuthenticator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ProviderAuthenticator.java	24 Nov 2006 23:15:19 -0000	1.10
  +++ ProviderAuthenticator.java	4 Dec 2006 01:21:52 -0000	1.11
  @@ -10,7 +10,7 @@
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  -import org.jboss.seam.security.Authentication;
  +import org.jboss.seam.security.Identity;
   import org.jboss.seam.security.AuthenticationException;
   import org.jboss.seam.security.provider.AuthenticationProvider;
   import org.jboss.seam.util.Reflections;
  @@ -34,7 +34,7 @@
      * @throws AuthenticationException
      */
     @Override
  -  public Authentication doAuthentication(Authentication authentication)
  +  public Identity doAuthentication(Identity authentication)
         throws AuthenticationException
     {
       for (Object p : providers)
  @@ -46,7 +46,7 @@
         else if (p instanceof Component)
           provider = (AuthenticationProvider) ( (Component) p).newInstance();
   
  -      Authentication result = provider.authenticate(authentication);
  +      Identity result = provider.authenticate(authentication);
         if (result != null)
           return result;
       }