User: oleg    
  Date: 00/10/16 10:53:40

  Modified:    src/main/org/jboss/security CacheRealmMapping.java
                        DatabaseRealmMapping.java SimpleRealmMapping.java
  Log:
  Added getPrincipal, so that Principal for a bean may differ from the original one
  
  Revision  Changes    Path
  1.2       +24 -20    jboss/src/main/org/jboss/security/CacheRealmMapping.java
  
  Index: CacheRealmMapping.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/security/CacheRealmMapping.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CacheRealmMapping.java    2000/08/06 21:52:14     1.1
  +++ CacheRealmMapping.java    2000/10/16 17:53:39     1.2
  @@ -31,33 +31,37 @@
   import org.jboss.system.RealmMapping;
   
   /**
  - *   CacheRealmMapping has two purposes (one of them currently unimplemented.)
  - *   It allows beans to have mappings for multiple security realms, and it
  - *   (eventually) will cache data from realms that allow it. 
  + *  CacheRealmMapping has two purposes (one of them currently unimplemented.)
  + *  It allows beans to have mappings for multiple security realms, and it
  + *  (eventually) will cache data from realms that allow it. 
    *      
    *   @see EJBSecurityManager
    *   @author Daniel O'Connor [EMAIL PROTECTED]
    */
   public class CacheRealmMapping implements RealmMapping
   {
  -     private LinkedList realms = new LinkedList();
  +    private LinkedList realms = new LinkedList();
   
  -     public void addRealmMapping( RealmMapping realmMapping )
  -     {
  -             realms.add( realmMapping );
  -     }
  +    public Principal getPrincipal( Principal principal ) {
  +        return principal;
  +    }
   
  -     public boolean doesUserHaveRole( Principal principal, Set roleNames )
  -     {
  -             Iterator iter=realms.iterator();
  -             while( iter.hasNext() )
  -             {
  -                     RealmMapping realmMapping = (RealmMapping) iter.next();
  -                     if (realmMapping.doesUserHaveRole( principal, roleNames ))
  -                             return true;
  -             }
  -             return false;
  -     }
  -     
  +    public void addRealmMapping( RealmMapping realmMapping )
  +    {
  +        realms.add( realmMapping );
  +    }
  +
  +    public boolean doesUserHaveRole( Principal principal, Set roleNames )
  +    {
  +        Iterator iter=realms.iterator();
  +        while( iter.hasNext() )
  +        {
  +            RealmMapping realmMapping = (RealmMapping) iter.next();
  +            if (realmMapping.doesUserHaveRole( principal, roleNames ))
  +                return true;
  +        }
  +        return false;
  +    }
  +    
   }
   
  
  
  
  1.3       +4 -0      jboss/src/main/org/jboss/security/DatabaseRealmMapping.java
  
  Index: DatabaseRealmMapping.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/security/DatabaseRealmMapping.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DatabaseRealmMapping.java 2000/10/05 15:54:03     1.2
  +++ DatabaseRealmMapping.java 2000/10/16 17:53:39     1.3
  @@ -43,6 +43,10 @@
   public class DatabaseRealmMapping implements RealmMapping
   {
   
  +  public Principal getPrincipal( Principal principal ) {
  +    return principal;
  +  }
  +
     public boolean doesUserHaveRole( Principal principal, Set roleNames )
     {
       Connection con = null;
  
  
  
  1.3       +4 -0      jboss/src/main/org/jboss/security/SimpleRealmMapping.java
  
  Index: SimpleRealmMapping.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/security/SimpleRealmMapping.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleRealmMapping.java   2000/10/05 15:54:03     1.2
  +++ SimpleRealmMapping.java   2000/10/16 17:53:39     1.3
  @@ -41,6 +41,10 @@
   public class SimpleRealmMapping implements RealmMapping
   {
   
  +  public Principal getPrincipal( Principal principal ) {
  +    return principal;
  +  }
  +
     public boolean doesUserHaveRole( Principal principal, Set roleNames )
     {
       if (roleNames == null)
  
  
  

Reply via email to