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

[Shane Bryzak]

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

  Modified:    src/main/org/jboss/seam/security     PermissionHandler.java
                        SeamSecurityManager.java UsernamePasswordToken.java
  Removed:     src/main/org/jboss/seam/security     Authentication.java
  Log:
  Authentication superseded by Identity
  
  Revision  Changes    Path
  1.5       +1 -1      jboss-seam/src/main/org/jboss/seam/security/PermissionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PermissionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/PermissionHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PermissionHandler.java	4 Dec 2006 01:10:19 -0000	1.4
  +++ PermissionHandler.java	4 Dec 2006 01:21:52 -0000	1.5
  @@ -78,7 +78,7 @@
       Permission required = new SeamPermission(permissionName, action);
   
       AclProvider provider = (AclProvider) Component.getInstance(providers.get(action), true);
  -    Principal principal = Authentication.instance();
  +    Principal principal = Identity.instance();
   
       if (provider != null)
       {
  
  
  
  1.20      +2 -2      jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamSecurityManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- SeamSecurityManager.java	4 Dec 2006 01:10:19 -0000	1.19
  +++ SeamSecurityManager.java	4 Dec 2006 01:21:52 -0000	1.20
  @@ -124,7 +124,7 @@
     private void checkRolePermissions(String permissionName, String action)
     {
       Permission required = new SeamPermission(permissionName, action);
  -    for (String role : Authentication.instance().getRoles())
  +    for (String role : Identity.instance().getRoles())
       {
         Set<Permission> permissions = rolePermissions.get(role);
         if (permissions != null && permissions.contains(required))
  @@ -155,7 +155,7 @@
       return null;
     }
   
  -  public Permissions getPermissions(Object value, Authentication auth)
  +  public Permissions getPermissions(Object value, Identity ident)
     {
       return null;
     }
  
  
  
  1.7       +3 -3      jboss-seam/src/main/org/jboss/seam/security/UsernamePasswordToken.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UsernamePasswordToken.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/UsernamePasswordToken.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- UsernamePasswordToken.java	14 Nov 2006 05:24:04 -0000	1.6
  +++ UsernamePasswordToken.java	4 Dec 2006 01:21:52 -0000	1.7
  @@ -3,7 +3,7 @@
   /**
    * @author Shane Bryzak
    */
  -public class UsernamePasswordToken extends Authentication
  +public class UsernamePasswordToken extends Identity
   {
     private String[] roles;
     private Object credentials;