[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment ContainerSecurityBuilder.java

[maguro]

maguro      2005/02/27 22:22:17

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        ContainerSecurityBuilder.java
  Log:

  Store permissions in a PermissionCollection.
  
  Revision  Changes    Path
  1.9       +4 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java
  
  Index: ContainerSecurityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContainerSecurityBuilder.java     26 Jan 2005 15:13:21 -0000      1.8
  +++ ContainerSecurityBuilder.java     28 Feb 2005 03:22:17 -0000      1.9
  @@ -49,6 +49,7 @@
   
   import java.lang.reflect.Method;
   import java.security.Permission;
  +import java.security.PermissionCollection;
   import java.security.Permissions;
   import java.util.Enumeration;
   import java.util.HashSet;
  @@ -77,6 +78,7 @@
   import org.apache.geronimo.xbeans.j2ee.RoleNameType;
   import org.apache.geronimo.xbeans.j2ee.SecurityIdentityType;
   import org.apache.geronimo.xbeans.j2ee.SecurityRoleRefType;
  +
   import org.openejb.security.SecurityConfiguration;
   
   
  @@ -211,9 +213,9 @@
                   String roleLink = 
roleReferences[i].getRoleLink().getStringValue();
   
                   Map roleRefPermissions = 
securityConfiguration.getRoleReferences();
  -                Set roleLinks = (Set) roleRefPermissions.get(roleLink);
  +                PermissionCollection roleLinks = (PermissionCollection) 
roleRefPermissions.get(roleLink);
                   if (roleLinks == null) {
  -                    roleLinks = new HashSet();
  +                    roleLinks = new Permissions();
                       roleRefPermissions.put(roleLink, roleLinks);
   
                   }