[jboss-cvs] JBossAS SVN: r59063 - trunk/ejb3/src/main/org/jboss/ejb3

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Dec 15 13:23:19 EST 2006


Author: anil.saldhana at jboss.com
Date: 2006-12-15 13:23:19 -0500 (Fri, 15 Dec 2006)
New Revision: 59063

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
Log:
merge from tck branch missed

Modified: trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2006-12-15 17:02:18 UTC (rev 59062)
+++ trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2006-12-15 18:23:19 UTC (rev 59063)
@@ -24,8 +24,7 @@
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.lang.reflect.InvocationHandler;
+import java.io.ObjectOutput; 
 import java.security.Identity;
 import java.security.Principal;
 import java.util.HashSet;
@@ -48,14 +47,14 @@
 import javax.xml.rpc.handler.MessageContext;
 import org.jboss.annotation.security.SecurityDomain;
 import org.jboss.aop.Advisor;
+import org.jboss.ejb3.security.SecurityDomainManager;
 import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.ejb3.tx.UserTransactionImpl;
 import org.jboss.logging.Logger;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.util.NestedRuntimeException;
+import org.jboss.security.SimplePrincipal; 
 
 /**
  * Comment
@@ -103,7 +102,7 @@
    {
       SecurityDomain securityAnnotation = (SecurityDomain) ((Advisor) container).resolveAnnotation(SecurityDomain.class);
       if (securityAnnotation == null) return;
-      Object domain = ctx.lookup("java:/jaas/" + securityAnnotation.value());
+      Object domain = SecurityDomainManager.getSecurityManager(securityAnnotation.value(), ctx);
       rm = (RealmMapping) domain;
    }
 




More information about the jboss-cvs-commits mailing list