[jboss-cvs] JBossAS SVN: r74281 - 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-06-07 22:29:47 -0400 (Sat, 07 Jun 2008)
New Revision: 74281

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/SecurityActions.java
Log:
EJBTHREE-1410: fix package for SecurityContextAssociation

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java	2008-06-07 05:56:45 UTC (rev 74280)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java	2008-06-08 02:29:47 UTC (rev 74281)
@@ -29,7 +29,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityContext;
-import org.jboss.security.plugins.SecurityContextAssociation;
 
 /**
  * An interceptor that enforces the run-as identity declared by a bean.
@@ -56,35 +55,6 @@
       return runAsIdentity;
    }
 
-   /*public Object invoke(Invocation invocation) throws Throwable
-   { 
-      Subject previousSubject = null;
-      try
-      {
-         RunAsIdentity runAsIdentity = getRunAsIdentity(invocation);
-         SecurityActions.pushRunAs(runAsIdentity);
-         
-         runAsIdentity = SecurityActions.peekRunAsIdentity(1);
-         if (runAsIdentity != null)
-         {
-            previousSubject = SecurityActions.getActiveSubject();
-            Set newPrincipals = runAsIdentity.getPrincipalsSet();
-            Subject newSubject = new Subject(false, newPrincipals, new HashSet(), new HashSet());
-            SecurityAssociation.setSubject(newSubject);
-         }
-         
-         return invocation.invokeNext(); 
-      }
-      finally
-      {
-         if (previousSubject != null)
-            SecurityAssociation.setSubject(previousSubject);
-         
-         SecurityActions.popRunAs();
-      }
-   }
-*/
-   
    public Object invoke(Invocation invocation) throws Throwable
    { 
       //Check for ejbTimeOut
@@ -104,7 +74,7 @@
          if(domain != null)
          {
             sc = SecurityActions.createSecurityContext(domain.value());
-            SecurityContextAssociation.setSecurityContext(sc);
+            SecurityActions.setSecurityContext(sc);
          }  
       }
       

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/SecurityActions.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/SecurityActions.java	2008-06-07 05:56:45 UTC (rev 74280)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/security/SecurityActions.java	2008-06-08 02:29:47 UTC (rev 74281)
@@ -37,7 +37,7 @@
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextFactory;
 import org.jboss.security.SubjectInfo;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 
 /**