[jboss-cvs] JBossAS SVN: r69639 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth.

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

Author: anil.saldhana at jboss.com
Date: 2008-02-05 17:43:10 -0500 (Tue, 05 Feb 2008)
New Revision: 69639

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java
Log:
SECURITY-115: Sec Ctx Association to spi

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java	2008-02-05 22:41:30 UTC (rev 69638)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java	2008-02-05 22:43:10 UTC (rev 69639)
@@ -55,7 +55,7 @@
 import org.jboss.security.SubjectSecurityManager;
 import org.jboss.security.auth.callback.AppCallbackHandler;
 import org.jboss.security.auth.callback.SecurityAssociationHandler;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 import org.jboss.util.CachePolicy;
 import org.jboss.util.TimedCachePolicy;
 

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java	2008-02-05 22:41:30 UTC (rev 69638)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java	2008-02-05 22:43:10 UTC (rev 69639)
@@ -41,7 +41,7 @@
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextFactory;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityContextAssociation;
 
 /** Common PrivilegedAction used by classes in this package.
  * 
@@ -51,24 +51,24 @@
  */
 class SubjectActions
 {
-   private static class ToStringSubjectAction implements PrivilegedAction
+   private static class ToStringSubjectAction implements PrivilegedAction<String>
    {
       Subject subject;
       ToStringSubjectAction(Subject subject)
       {
          this.subject = subject;
       }
-      public Object run()
+      public String run()
       {
          StringBuffer tmp = new StringBuffer();
          tmp.append("Subject(");
          tmp.append(System.identityHashCode(subject));
          tmp.append(").principals=");
-         Iterator principals = subject.getPrincipals().iterator();
+         Iterator<Principal> principals = subject.getPrincipals().iterator();
          while( principals.hasNext() )
          {
             Object p = principals.next();
-            Class c = p.getClass();
+            Class<?> c = p.getClass();
             tmp.append(c.getName());
             tmp.append('@');
             tmp.append(System.identityHashCode(c));
@@ -80,10 +80,10 @@
       }
    }
 
-   private static class GetSubjectAction implements PrivilegedExceptionAction
+   private static class GetSubjectAction implements PrivilegedExceptionAction<Subject>
    {
-      static PrivilegedExceptionAction ACTION = new GetSubjectAction();
-      public Object run() throws PolicyContextException
+      static PrivilegedExceptionAction<Subject> ACTION = new GetSubjectAction();
+      public Subject run() throws PolicyContextException
       {
          return (Subject) PolicyContext.getContext(SecurityConstants.SUBJECT_CONTEXT_KEY);  
       }
@@ -107,11 +107,12 @@
          this.deepCopy = flag;
       }
       
+      @SuppressWarnings("unchecked")
       public Object run()
       {
          Set principals = fromSubject.getPrincipals();
          Set principals2 = toSubject.getPrincipals();
-         Iterator iter = principals.iterator();
+         Iterator<Principal> iter = principals.iterator();
          while( iter.hasNext() )
             principals2.add(getCloneIfNeeded(iter.next()));  
          Set privateCreds = fromSubject.getPrivateCredentials();