[jboss-cvs] JBossAS SVN: r79766 - in trunk/server/src/main/org/jboss: web/deployers and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-10-20 16:27:57 -0400 (Mon, 20 Oct 2008)
New Revision: 79766

Modified:
   trunk/server/src/main/org/jboss/ejb/Container.java
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
Log:
JBAS-6060: tolerate a security domain without the java:/jaas prefix

Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java	2008-10-20 20:20:57 UTC (rev 79765)
+++ trunk/server/src/main/org/jboss/ejb/Container.java	2008-10-20 20:27:57 UTC (rev 79766)
@@ -89,6 +89,7 @@
 import org.jboss.security.AnybodyPrincipal;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.ISecurityManagement;
+import org.jboss.security.SecurityConstants;
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.SimplePrincipal;
@@ -1450,7 +1451,11 @@
       if (securityDomain == null)
          securityDomain = metaData.getApplicationMetaData().getSecurityDomain();
       if (securityDomain != null)
-      {
+      { 
+         //JBAS-6060: Tolerate a Security Domain configuration without the java:/jaas prefix
+         if(securityDomain.startsWith(SecurityConstants.JAAS_CONTEXT_ROOT) == false)
+            securityDomain = SecurityConstants.JAAS_CONTEXT_ROOT + "/" + securityDomain;
+         
          log.debug("Binding securityDomain: " + securityDomain + " to JDNI ENC as: security/security-domain");
 
          Util.bind(envCtx, "security/security-domain", new LinkRef(securityDomain));

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2008-10-20 20:20:57 UTC (rev 79765)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2008-10-20 20:27:57 UTC (rev 79766)
@@ -65,6 +65,7 @@
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.naming.Util;
 import org.jboss.security.ISecurityManagement;
+import org.jboss.security.SecurityConstants;
 import org.jboss.security.authorization.PolicyRegistration;
 import org.jboss.web.WebApplication;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -825,6 +826,11 @@
          securityDomain = getDefaultSecurityDomain();
          log.debug("No security-domain given, using default: " + securityDomain);
       }
+      
+      //JBAS-6060: Tolerate a Security Domain configuration without the java:/jaas prefix
+      if(securityDomain.startsWith(SecurityConstants.JAAS_CONTEXT_ROOT) == false)
+         securityDomain = SecurityConstants.JAAS_CONTEXT_ROOT + "/" + securityDomain;
+      
       log.debug("Linking security/securityMgr to JNDI name: " + securityDomain);
       Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
       Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain+"/realmMapping"));