[jboss-cvs] JBossAS SVN: r103600 - in projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins: audit and 2 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2010-04-06 18:20:58 -0400 (Tue, 06 Apr 2010)
New Revision: 103600

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java
Log:
SECURITY-501: prune the security domain prefix if any

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2010-04-06 21:53:33 UTC (rev 103599)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2010-04-06 22:20:58 UTC (rev 103600)
@@ -47,6 +47,7 @@
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityRolesAssociation;
+import org.jboss.security.SecurityUtil;
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.acl.ACLContext;
 import org.jboss.security.authorization.AuthorizationContext;
@@ -65,7 +66,6 @@
 import org.jboss.security.mapping.MappingType;
 import org.jboss.security.plugins.acl.JBossACLContext;
 import org.jboss.security.plugins.authorization.JBossAuthorizationContext;
-import org.jboss.util.NotImplementedException;
 
 //$Id$
 
@@ -93,7 +93,7 @@
    
    public JBossAuthorizationManager(String securityDomainName)
    {
-      this.securityDomain = securityDomainName;
+      this.securityDomain = SecurityUtil.unprefixSecurityDomain( securityDomainName );
    } 
    
    /**
@@ -306,7 +306,7 @@
     */
    public Group getTargetRoles(Principal targetPrincipal, Map<String,Object> contextMap)
    {
-      throw new NotImplementedException();
+      throw new RuntimeException("NYI");
    }
 
    //Private Methods

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java	2010-04-06 21:53:33 UTC (rev 103599)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java	2010-04-06 22:20:58 UTC (rev 103600)
@@ -14,6 +14,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jboss.logging.Logger;
+import org.jboss.security.SecurityUtil;
 import org.jboss.security.audit.AuditContext;
 import org.jboss.security.audit.AuditEvent;
 import org.jboss.security.audit.AuditManager;
@@ -50,7 +51,7 @@
    
    public JBossAuditManager(String secDomain)
    {
-      this.securityDomain = secDomain;
+      this.securityDomain = SecurityUtil.unprefixSecurityDomain(secDomain);  
    }
    
    public AuditContext getAuditContext() throws PrivilegedActionException

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java	2010-04-06 21:53:33 UTC (rev 103599)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java	2010-04-06 22:20:58 UTC (rev 103600)
@@ -233,7 +233,7 @@
     */
    public JaasSecurityManagerBase(String securityDomain, CallbackHandler handler)
    {
-      this.securityDomain = securityDomain;
+      this.securityDomain = SecurityUtil.unprefixSecurityDomain( securityDomain );
       this.handler = handler;
       String categoryName = getClass().getName()+'.'+securityDomain;
       this.log = Logger.getLogger(categoryName);

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java	2010-04-06 21:53:33 UTC (rev 103599)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java	2010-04-06 22:20:58 UTC (rev 103600)
@@ -28,6 +28,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityUtil;
 import org.jboss.security.config.ApplicationPolicy;
 import org.jboss.security.config.MappingInfo;
 import org.jboss.security.config.SecurityConfiguration; 
@@ -54,7 +55,7 @@
 
    public JBossMappingManager(String domain)
    {
-     this.securityDomain = domain;   
+      this.securityDomain = SecurityUtil.unprefixSecurityDomain(domain);  
    }