[openejb-scm] openejb/modules/core/src/java/org/openejb GenericEJBContainer.java

[maguro]

maguro      2005/02/21 13:23:05

  Modified:    modules/core/src/java/org/openejb GenericEJBContainer.java
  Log:

  Broke out RoleMapper from the PolicyConfiguration heirarchy.
  
  Revision  Changes    Path
  1.40      +5 -3      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- GenericEJBContainer.java  19 Feb 2005 09:46:38 -0000      1.39
  +++ GenericEJBContainer.java  21 Feb 2005 18:23:05 -0000      1.40
  @@ -81,6 +81,7 @@
   import org.apache.geronimo.naming.reference.KernelAwareReference;
   import org.apache.geronimo.security.ContextManager;
   import org.apache.geronimo.security.jacc.RoleMappingConfiguration;
  +import org.apache.geronimo.security.jacc.RoleMappingConfigurationFactory;
   import org.apache.geronimo.timer.ThreadPooledTimer;
   import org.apache.geronimo.transaction.TrackedConnectionAssociator;
   import org.apache.geronimo.transaction.UserTransactionImpl;
  @@ -391,12 +392,13 @@
                       policyConfiguration.addToRole(role, (Permissions) 
securityConfiguration.getRolePolicies().get(role));
                   }
   
  -                if (policyConfiguration instanceof RoleMappingConfiguration) 
{
  +                RoleMappingConfiguration roleMapper = 
RoleMappingConfigurationFactory.getRoleMappingFactory().getRoleMappingConfiguration(securityConfiguration.getPolicyContextId(),
 true);
  +                if (roleMapper != null) {
                       Iterator iter = 
securityConfiguration.getRoleMapping().keySet().iterator();
                       while (iter.hasNext()) {
                           String roleName = (String) iter.next();
                           Set principalSet = (Set) 
securityConfiguration.getRoleMapping().get(roleName);
  -                        ((RoleMappingConfiguration) 
policyConfiguration).addRoleMapping(roleName, principalSet);
  +                        roleMapper.addRoleMapping(roleName, principalSet);
                       }
                   }