[jboss-cvs] JBossAS SVN: r109433 - branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins.

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

Author: mmoyses
Date: 2010-11-23 12:48:39 -0500 (Tue, 23 Nov 2010)
New Revision: 109433

Modified:
   branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
Log:
JBPAPP-5459: binding java:/jaas to JNDI before any service in deploy directory require it

Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java	2010-11-23 17:38:11 UTC (rev 109432)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java	2010-11-23 17:48:39 UTC (rev 109433)
@@ -63,6 +63,7 @@
 import org.jboss.security.config.SecurityConfiguration;
 import org.jboss.security.integration.JNDIBasedSecurityManagement;
 import org.jboss.security.integration.SecurityConstantsBridge;
+import org.jboss.security.integration.SecurityDomainObjectFactory;
 import org.jboss.security.jacc.SubjectPolicyContextHandler;
 import org.jboss.security.propertyeditor.PrincipalEditor;
 import org.jboss.security.propertyeditor.SecurityDomainEditor;
@@ -482,6 +483,16 @@
       Reference ref = new Reference("javax.naming.Context", refAddr, factoryName, null);
       ctx.rebind(DEFAULT_CACHE_POLICY_PATH, ref);
       log.debug("cachePolicyCtxPath="+cacheJndiName);
+      
+      // JBAPAPP-5459: binding java:/jaas to JNDI before services in the deploy start
+      /* Create a mapping from the java:/jaas context to a SecurityDomainObjectFactory
+      so that any lookup against java:/jaas/domain returns an instance of our
+      security manager class.
+      */
+      refAddr = new StringRefAddr("nns", "JSM");
+      factoryName = SecurityDomainObjectFactory.class.getName();
+      ref = new Reference("javax.naming.Context", refAddr, factoryName, null);
+      ctx.rebind(SecurityConstants.JAAS_CONTEXT_ROOT, ref);
 
       // Bind the default SecurityProxyFactory instance under java:/SecurityProxyFactory
       SecurityProxyFactory proxyFactory = (SecurityProxyFactory) securityProxyFactoryClass.newInstance();