Author: anil.saldhana at jboss.com
Date: 2007-05-01 00:25:47 -0400 (Tue, 01 May 2007)
New Revision: 62684
Modified:
trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationActions.java
Log:
use the util on the context
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationActions.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationActions.java 2007-05-01 04:25:02 UTC (rev 62683)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationActions.java 2007-05-01 04:25:47 UTC (rev 62684)
@@ -29,8 +29,7 @@
import org.jboss.security.RunAs;
import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SubjectInfo;
+import org.jboss.security.SecurityContext;
import org.jboss.security.plugins.SecurityContextAssociation;
import org.jboss.security.plugins.SecurityContextFactory;
@@ -92,9 +91,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- SubjectInfo si = sc.getSubjectInfo();
- Subject subject = si != null ? si.getAuthenticatedSubject() : null;
- return subject;
+ return sc.getUtil().getSubject();
}
}
private static class GetPrincipalAction implements PrivilegedAction
@@ -106,9 +103,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- SubjectInfo si = sc.getSubjectInfo();
- return si != null ? si.getAuthenticationPrincipal() : null;
- //return principal;
+ return sc.getUtil().getUserPrincipal();
}
}
private static class GetCredentialAction implements PrivilegedAction
@@ -121,8 +116,7 @@
SecurityContext sc = getSecurityContext();
if(sc == null)
throw new IllegalStateException("Security Context is null");
- SubjectInfo si = sc.getSubjectInfo();
- return si != null ? si.getAuthenticationCredential() : null;
+ return sc.getUtil().getCredential();
}
}