[jboss-cvs] JBossAS SVN: r69638 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security: auth/message/config and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Feb 5 17:41:31 EST 2008 

Author: anil.saldhana at jboss.com
Date: 2008-02-05 17:41:30 -0500 (Tue, 05 Feb 2008)
New Revision: 69638

Removed:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SecurityContextAssociation.java
Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/SecurityActions.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SubjectActions.java
Log:
SECURITY-115: Sec Ctx Association to spi

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -28,7 +28,7 @@
 import javax.security.auth.Subject;
 
 import org.jboss.logging.Logger;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 /**
  * The SecurityAssociation class maintains the security principal and

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -27,7 +27,7 @@
 
 import javax.security.auth.Subject;
 
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 /** A PrivilegedAction implementation for setting the SecurityAssociation
  * principal and credential

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/SecurityActions.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/SecurityActions.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -25,7 +25,7 @@
 import java.security.PrivilegedAction;
 
 import org.jboss.security.SecurityContext;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 //$Id$
 
@@ -39,9 +39,9 @@
 {   
    static ClassLoader getContextClassLoader()
    {
-      return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
       { 
-         public Object run()
+         public ClassLoader run()
          { 
             return Thread.currentThread().getContextClassLoader();
          }
@@ -51,10 +51,10 @@
 
    static SecurityContext getSecurityContext()
    {
-      return (SecurityContext) AccessController.doPrivileged(new PrivilegedAction()
+      return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
       {
 
-         public Object run()
+         public SecurityContext run()
          { 
             return SecurityContextAssociation.getSecurityContext();
          }

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -29,7 +29,7 @@
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextFactory;
 import org.jboss.security.SimplePrincipal;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 //$Id$
 

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -24,6 +24,7 @@
 import static org.jboss.security.SecurityConstants.SUBJECT_CONTEXT_KEY;
 
 import java.security.AccessController;
+import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.util.HashSet;
 import java.util.Set;
@@ -35,7 +36,7 @@
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SubjectInfo;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 /** A PolicyContextHandler for the current authenticated Subject.
  * @author Scott.Stark at jboss.org
@@ -44,13 +45,13 @@
  */
 public class SubjectPolicyContextHandler implements PolicyContextHandler
 {
-   public static final HashSet EMPTY_SET = new HashSet();
+   public static final HashSet<Object> EMPTY_SET = new HashSet<Object>();
 
-   private static class GetSubjectAction implements PrivilegedAction
+   private static class GetSubjectAction implements PrivilegedAction<Subject>
    {
-      static PrivilegedAction ACTION = new GetSubjectAction(); 
+      static PrivilegedAction<Subject> ACTION = new GetSubjectAction(); 
       
-      public Object run()
+      public Subject run()
       {
          Subject theSubject = null;
          SecurityContext sc = SecurityContextAssociation.getSecurityContext();
@@ -65,7 +66,7 @@
                
                if( activeSubject != null )
                {
-                  Set principalsSet = null;
+                  Set<Principal> principalsSet = null;
                   if( callerRunAsIdentity == null )
                   {
                      principalsSet = activeSubject.getPrincipals();
@@ -83,7 +84,7 @@
                { 
                   if( callerRunAsIdentity != null )
                   {
-                     Set principalsSet = callerRunAsIdentity.getPrincipalsSet();
+                     Set<Principal> principalsSet = callerRunAsIdentity.getPrincipalsSet();
                      theSubject = new Subject(true, principalsSet, EMPTY_SET, EMPTY_SET);
                   }
                }

Deleted: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SecurityContextAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SecurityContextAssociation.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SecurityContextAssociation.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -1,52 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.security.plugins;
- 
-import org.jboss.security.SecurityContext;
-
-//$Id$
-
-/**
- *  Security Context association in a threadlocal
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Dec 27, 2006 
- *  @version $Revision$
- */
-public class SecurityContextAssociation
-{
-   private static ThreadLocal<SecurityContext> securityContextLocal = new ThreadLocal<SecurityContext>();
-   
-   public static void setSecurityContext(SecurityContext sc)
-   {
-      securityContextLocal.set(sc);
-   }
-   
-   public static SecurityContext getSecurityContext()
-   {
-      return securityContextLocal.get();
-   } 
-   
-   public static void clearSecurityContext() 
-   {
-      securityContextLocal.set(null);
-   }
-}

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SubjectActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SubjectActions.java	2008-02-05 22:38:48 UTC (rev 69637)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/SubjectActions.java	2008-02-05 22:41:30 UTC (rev 69638)
@@ -40,6 +40,7 @@
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
 import org.jboss.security.SecurityContextFactory;
 
 /** Common PrivilegedAction used by classes in this package.

More information about the jboss-cvs-commits mailing list