[jboss-cvs] JBossAS SVN: r92439 - projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security.

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

Author: pete.muir at jboss.org
Date: 2009-08-17 15:57:39 -0400 (Mon, 17 Aug 2009)
New Revision: 92439

Modified:
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java
Log:
Better impl

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java	2009-08-17 19:48:30 UTC (rev 92438)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java	2009-08-17 19:57:39 UTC (rev 92439)
@@ -18,10 +18,8 @@
 
 import java.security.Principal;
 
-import javax.security.auth.Subject;
-import javax.security.jacc.PolicyContext;
-import javax.security.jacc.PolicyContextException;
-
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
 import org.jboss.webbeans.security.spi.SecurityServices;
 
 /**
@@ -31,19 +29,10 @@
 public class JBossSecurityServices implements SecurityServices
 {
    
-   private static final String SUBJECT_CONTEXT_KEY = "javax.security.auth.Subject.container";
-   
    public Principal getPrincipal()
    {
-      try
-      {
-         Subject caller = (Subject) PolicyContext.getContext(SUBJECT_CONTEXT_KEY);
-         return caller.getPrincipals().iterator().next();
-      }
-      catch (PolicyContextException e)
-      {
-         throw new IllegalStateException(e);
-      }
+      SecurityContext sc = SecurityContextAssociation.getSecurityContext();
+      return sc.getUtil().getUserPrincipal();
    }
 
 }