[Jboss-cvs] JBossAS SVN: r56123 - in trunk/server/src/main/org/jboss: ejb web

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

Author: anil.saldhana at jboss.com
Date: 2006-08-21 12:43:36 -0400 (Mon, 21 Aug 2006)
New Revision: 56123

Modified:
   trunk/server/src/main/org/jboss/ejb/Container.java
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
   trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java
Log:
JBAS-3535: Use AuthorizationManager from JNDI

Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java	2006-08-21 16:42:01 UTC (rev 56122)
+++ trunk/server/src/main/org/jboss/ejb/Container.java	2006-08-21 16:43:36 UTC (rev 56123)
@@ -1419,14 +1419,10 @@
          log.debug("Binding securityDomain: " + securityDomain +
             " to JDNI ENC as: security/security-domain");
 
-         Util.bind(
-                 envCtx,
-                 "security/security-domain",
-                 new LinkRef(securityDomain));
-         Util.bind(
-                 envCtx,
-                 "security/subject",
-                 new LinkRef(securityDomain + "/subject"));
+         Util.bind( envCtx, "security/security-domain", new LinkRef(securityDomain));
+         Util.bind( envCtx, "security/subject", new LinkRef(securityDomain + "/subject"));
+         Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain + "/realmMapping"));
+         Util.bind(envCtx, "security/authorizationMgr", new LinkRef(securityDomain+"/authorizationMgr"));
       }
 
       log.debug("End java:comp/env for EJB: " + beanMetaData.getEjbName());

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-08-21 16:42:01 UTC (rev 56122)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-08-21 16:43:36 UTC (rev 56123)
@@ -70,7 +70,6 @@
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.Util;
 import org.jboss.security.authorization.PolicyRegistration;  
-import org.jboss.security.plugins.AuthorizationManagerServiceMBean;
 import org.jboss.system.Registry;
 import org.jboss.system.ServiceControllerMBean;
 import org.jboss.system.ServiceMBeanSupport;
@@ -159,9 +158,8 @@
 
    /** Whether we are call by value */
    private boolean callByValue;
+    
    
-   private AuthorizationManagerServiceMBean authorizationManagerService;
-   
    public EjbModule(final DeploymentInfo di, TransactionManager tm,
       ObjectName webServiceName)
    {
@@ -173,11 +171,7 @@
       }
       this.name = name;
       this.tm = tm;
-      this.webServiceName = webServiceName;
-
-      this.authorizationManagerService = (AuthorizationManagerServiceMBean)
-         MBeanProxyExt.create(AuthorizationManagerServiceMBean.class,
-                              AuthorizationManagerServiceMBean.OBJECT_NAME);
+      this.webServiceName = webServiceName; 
    }
 
    public Map getModuleDataMap()
@@ -401,8 +395,8 @@
             securityDomain = SecurityConstants.DEFAULT_EJB_APPLICATION_POLICY; //Fallback
          URL xacmlURL = deploymentInfo.localCl.findResource("META-INF/jboss-xacml-policy.xml");
          if(xacmlURL != null)
-         { 
-            AuthorizationManager authzmgr = authorizationManagerService.getAuthorizationManager(securityDomain);
+         {  
+            AuthorizationManager authzmgr = Util.getAuthorizationManager(securityDomain);
             if(authzmgr instanceof PolicyRegistration)
             {
                PolicyRegistration xam = (PolicyRegistration)authzmgr;
@@ -494,8 +488,8 @@
       //Unregister any xacml policies
       String securityDomain = Util.unprefixSecurityDomain(metaData.getSecurityDomain());
       if(securityDomain != null)
-      {
-         AuthorizationManager authzmgr = authorizationManagerService.getAuthorizationManager(securityDomain);
+      {  
+         AuthorizationManager authzmgr = Util.getAuthorizationManager(securityDomain);
          if(authzmgr instanceof PolicyRegistration)
          {
             PolicyRegistration xam = (PolicyRegistration)authzmgr;
@@ -815,9 +809,8 @@
             AuthenticationManager ejbS = (AuthenticationManager) securityMgr;
             RealmMapping rM = (RealmMapping) securityMgr;
             container.setSecurityManager(ejbS);
-            container.setRealmMapping(rM);
-            String usd = org.jboss.security.Util.unprefixSecurityDomain(confSecurityDomain);
-            container.setAuthorizationManager(this.authorizationManagerService.getAuthorizationManager(usd));
+            container.setRealmMapping(rM); 
+            container.setAuthorizationManager(Util.getAuthorizationManager(confSecurityDomain));
          }
          catch (NamingException e)
          {

Modified: trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java	2006-08-21 16:42:01 UTC (rev 56122)
+++ trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java	2006-08-21 16:43:36 UTC (rev 56123)
@@ -447,12 +447,8 @@
          String prefixedSecurityDomain = webApp.getMetaData().getSecurityDomain();
          if(prefixedSecurityDomain != null)
          {
-            String securityDomain = org.jboss.security.Util.unprefixSecurityDomain(prefixedSecurityDomain);
-            AuthorizationManagerServiceMBean authorizationManager = (AuthorizationManagerServiceMBean)
-                                                      MBeanProxyExt.create(AuthorizationManagerServiceMBean.class,
-                                                                           AuthorizationManagerServiceMBean.OBJECT_NAME,
-                                                                           server);
-            AuthorizationManager authzmgr = authorizationManager.getAuthorizationManager(securityDomain);
+            AuthorizationManager authzmgr = 
+                org.jboss.security.Util.getAuthorizationManager(prefixedSecurityDomain);
             if(authzmgr instanceof PolicyRegistration)
             {
                PolicyRegistration xam = (PolicyRegistration)authzmgr;
@@ -796,7 +792,8 @@
       }
       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));
+      Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain+"/realmMapping"));
+      Util.bind(envCtx, "security/authorizationMgr", new LinkRef(securityDomain+"/authorizationMgr"));
       Util.bind(envCtx, "security/security-domain", new LinkRef(securityDomain));
       Util.bind(envCtx, "security/subject", new LinkRef(securityDomain + "/subject"));
    }