[jboss-cvs] JBossAS SVN: r62892 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-08 17:06:59 -0400 (Tue, 08 May 2007)
New Revision: 62892

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityService.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
Log:
use the constant for the subject key

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java	2007-05-08 21:04:31 UTC (rev 62891)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/DelegatingPolicy.java	2007-05-08 21:06:59 UTC (rev 62892)
@@ -39,6 +39,8 @@
 import javax.security.auth.Subject;
 
 import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
+
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 
 /**
@@ -186,7 +188,7 @@
             log.trace("implies, domain=" + domain + ", permission=" + permission);
             try
             {
-               Subject caller = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container");
+               Subject caller = (Subject) PolicyContext.getContext(SecurityConstants.SUBJECT_CONTEXT_KEY);
                log.trace("implies javax.security.auth.Subject.container: "+caller);
             }
             catch(Throwable e)

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityService.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityService.java	2007-05-08 21:04:31 UTC (rev 62891)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityService.java	2007-05-08 21:06:59 UTC (rev 62892)
@@ -31,6 +31,7 @@
 import javax.security.jacc.PolicyContext;
 
 import org.jboss.logging.Logger;
+import org.jboss.security.SecurityConstants;
 
 /** The SecurityService installs a java.security.Policy implementation that
  * handles the JACC permission checks. The Policy provider can be done using the
@@ -142,7 +143,7 @@
 
       // Register the default active Subject PolicyContextHandler
       SubjectPolicyContextHandler handler = new SubjectPolicyContextHandler();
-      PolicyContext.registerHandler(SubjectPolicyContextHandler.SUBJECT_CONTEXT_KEY,
+      PolicyContext.registerHandler(SecurityConstants.SUBJECT_CONTEXT_KEY,
          handler, true);
    }
 

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2007-05-08 21:04:31 UTC (rev 62891)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2007-05-08 21:06:59 UTC (rev 62892)
@@ -34,7 +34,8 @@
 import org.jboss.security.SubjectInfo;
 import org.jboss.security.plugins.SecurityContextAssociation;
 
-import static org.jboss.security.SecurityConstants.*;
+import static org.jboss.security.SecurityConstants.CALLER_RAI_IDENTIFIER;
+import static org.jboss.security.SecurityConstants.SUBJECT_CONTEXT_KEY;
 
 /** A PolicyContextHandler for the current authenticated Subject.
  * @author Scott.Stark at jboss.org
@@ -43,7 +44,6 @@
  */
 public class SubjectPolicyContextHandler implements PolicyContextHandler
 {
-   public static final String SUBJECT_CONTEXT_KEY = "javax.security.auth.Subject.container";
    public static final HashSet EMPTY_SET = new HashSet();
 
    private static class GetSubjectAction implements PrivilegedAction