[jboss-cvs] JBossAS SVN: r61958 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2007-04-01 00:43:50 -0400 (Sun, 01 Apr 2007)
New Revision: 61958

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
use mapping manager

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2007-04-01 04:43:09 UTC (rev 61957)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2007-04-01 04:43:50 UTC (rev 61958)
@@ -56,6 +56,8 @@
 
 import com.sun.xacml.Policy;
 
+import static org.jboss.security.SecurityConstants.ROLES_IDENTIFIER;
+
 //$Id$
 
 /**
@@ -309,7 +311,7 @@
          SubjectActions.setSecurityContext(sc, securityDomain);   
       } 
 
-      Group userRoles = (Group)sc.getData().get(JBossSecurityContext.ROLES);
+      Group userRoles = (Group)sc.getData().get(ROLES_IDENTIFIER);
       if(userRoles == null || "true".equalsIgnoreCase(SubjectActions.getRefreshSecurityContextRoles()))
          emptyContextRoles = true;
       userRoles = copyGroups(userRoles, subjectRoles); 
@@ -320,8 +322,8 @@
        * and the subject roles are not the same
        */
       if(subjectRoles != userRoles || emptyContextRoles)
-      {
-         MappingContext mc = sc.getMappingContext(Group.class);
+      { 
+         MappingContext mc = sc.getMappingManager().getMappingContext(Group.class);
          if(mc != null)
          {
             Map contextMap = new HashMap();
@@ -339,7 +341,7 @@
             if(trace)
                log.trace("Roles after mapping:"+ userRoles);
          } 
-         sc.getData().put(JBossSecurityContext.ROLES, userRoles); 
+         sc.getData().put(ROLES_IDENTIFIER, userRoles); 
       } 
 
       //Send the final processed (mapping applied) roles