[jboss-cvs] JBossAS SVN: r59236 - 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: 2006-12-26 16:13:36 -0500 (Tue, 26 Dec 2006)
New Revision: 59236

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/JBossSecurityContext.java
Log:
security context changes

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	2006-12-26 21:12:28 UTC (rev 59235)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2006-12-26 21:13:36 UTC (rev 59236)
@@ -321,7 +321,7 @@
        */
       if(subjectRoles != userRoles || emptyContextRoles)
       {
-         MappingContext mc = sc.getMappingContext(SecurityContext.MappingKeyInfo.ROLE_MAPPING);
+         MappingContext mc = sc.getMappingContext(Group.class);
          if(mc != null)
          {
             Map contextMap = new HashMap();

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java	2006-12-26 21:12:28 UTC (rev 59235)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java	2006-12-26 21:13:36 UTC (rev 59236)
@@ -18,6 +18,7 @@
 import org.jboss.security.AuthorizationManager;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;  
+import org.jboss.security.SubjectInfo;
 import org.jboss.security.Util; 
 import org.jboss.security.audit.AuditManager;
 import org.jboss.security.audit.SecurityAuditManager;
@@ -33,7 +34,7 @@
  *  @version $Revision$
  *  @since  Aug 30, 2006
  */
-public class JBossSecurityContext extends SecurityContext
+public class JBossSecurityContext implements SecurityContext
 { 
    protected static final Logger log = Logger.getLogger(JBossSecurityContext.class); 
    protected boolean trace = log.isTraceEnabled();  
@@ -100,7 +101,7 @@
    /**
     * @see SecurityContext#getMappingContext(String)
     */
-   public MappingContext getMappingContext(String key)
+   public MappingContext getMappingContext(Class mappingType)
    { 
       //Apply Mapping Logic  
       ApplicationPolicy aPolicy = Util.getApplicationPolicy(securityDomain);
@@ -118,7 +119,7 @@
                + securityDomain);
       MappingInfo rmi = null;
       MappingContext mc = null;
-      if(MappingKeyInfo.ROLE_MAPPING.equals(key))
+      if(mappingType == Group.class)
       {
          rmi = aPolicy.getRoleMappingInfo();
          if(rmi != null)