[jboss-cvs] JBossAS SVN: r71565 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security.

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

Author: anil.saldhana at jboss.com
Date: 2008-04-01 14:16:06 -0400 (Tue, 01 Apr 2008)
New Revision: 71565

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
Log:
EJBTHREE-1250: remove the security manager lookup in the rolebasedauthz interceptor factory

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java	2008-04-01 17:58:10 UTC (rev 71564)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java	2008-04-01 18:16:06 UTC (rev 71565)
@@ -23,15 +23,10 @@
 
 import java.security.CodeSource;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 import org.jboss.aop.Advisor;
 import org.jboss.aop.advice.AspectFactory;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RealmMapping;
 
 /**
  * Role Based AuthorizationInterceptor factory
@@ -46,31 +41,15 @@
 
    public Object createPerClass(Advisor advisor)
    {
-      Object domain = null;
       // Must be a separate line (EJBContainer cannot be dereferenced)
       EJBContainer container = EJBContainer.getEJBContainer(advisor);
-      try
-      {
-         InitialContext ctx = container.getInitialContext();
-         SecurityDomain securityAnnotation = (SecurityDomain) advisor.resolveAnnotation(SecurityDomain.class);
+      SecurityDomain securityAnnotation = (SecurityDomain) advisor.resolveAnnotation(SecurityDomain.class);
          
-         //If there is no annotation, return a null action interceptor
-         if(securityAnnotation == null)
-            return new NullInterceptor();
-         
-         domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(), ctx);
-      }
-      catch (NamingException e)
-      {
-         throw new RuntimeException(e);
-      }
-      AuthenticationManager manager = (AuthenticationManager) domain;
-      RealmMapping mapping = (RealmMapping) domain;
-      if (manager == null) throw new RuntimeException("Unable to find Security Domain");
-      //return new RoleBasedAuthorizationInterceptor(manager, mapping, container);
+      //If there is no annotation, return a null action interceptor
+      if(securityAnnotation == null)
+         return new NullInterceptor();
       CodeSource ejbCS = advisor.getClazz().getProtectionDomain().getCodeSource();
       String ejbName = container.getEjbName(); 
       return new RoleBasedAuthorizationInterceptorv2(container, ejbCS, ejbName);
    } 
-}
-
+}
\ No newline at end of file