[jboss-cvs] JBossAS SVN: r78790 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security: auth/message/config and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 23 11:45:14 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-09-23 11:45:14 -0400 (Tue, 23 Sep 2008)
New Revision: 78790
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/ClientLoginModule.java
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/SecurityAssociationAuthenticator.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/acl/JBossACLContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
Log:
cleanup and override of tostring
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/ClientLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/ClientLoginModule.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/ClientLoginModule.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -88,8 +88,6 @@
/** To restore prelogin identity **/
private SecurityContext cachedSecurityContext;
-
- private boolean serverMode = false;
/** Initialize this LoginModule. This checks for the options:
multi-threaded
@@ -118,8 +116,7 @@
*/
if(trace)
log.trace("Enabling multi-threaded mode");
- SecurityAssociationActions.setServer();
- this.serverMode = true;
+ SecurityAssociationActions.setServer();
}
flag = (String) options.get("restore-login-identity");
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-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -864,18 +864,21 @@
local = new ArrayListInheritableLocal();
}
+ @SuppressWarnings("unchecked")
int size()
{
ArrayList stack = (ArrayList) local.get();
return stack.size();
}
+ @SuppressWarnings("unchecked")
void push(RunAsIdentity runAs)
{
ArrayList stack = (ArrayList) local.get();
stack.add(runAs);
}
+ @SuppressWarnings("unchecked")
RunAsIdentity pop()
{
ArrayList stack = (ArrayList) local.get();
@@ -891,6 +894,7 @@
* with the value at depth.
* @return The run-as identity if one exists, null otherwise.
*/
+ @SuppressWarnings("unchecked")
RunAsIdentity peek(int depth)
{
ArrayList stack = (ArrayList) local.get();
@@ -984,6 +988,7 @@
}
}
+ @SuppressWarnings("unchecked")
private static class SubjectThreadLocalStack
{
ThreadLocal local;
@@ -1055,6 +1060,7 @@
}
}
+ @SuppressWarnings("unchecked")
private static class ArrayListLocal extends ThreadLocal
{
protected Object initialValue()
@@ -1064,6 +1070,7 @@
}
+ @SuppressWarnings("unchecked")
private static class ArrayListInheritableLocal extends InheritableThreadLocal
{
/**
@@ -1097,6 +1104,8 @@
}
}
+
+ @SuppressWarnings("unchecked")
private static class HashMapInheritableLocal<T>
extends InheritableThreadLocal<HashMap<String,Object>>
{
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-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -48,6 +48,8 @@
this.credential = credential;
this.subject = subject;
}
+
+ @SuppressWarnings("deprecation")
public Object run()
{
//Client Side usage
@@ -77,6 +79,7 @@
}
private static class PopPrincipalInfoAction implements PrivilegedAction<Object>
{
+ @SuppressWarnings("deprecation")
public Object run()
{
if(!getServer())
@@ -175,6 +178,7 @@
{
AccessController.doPrivileged(new PrivilegedAction<Object>()
{
+ @SuppressWarnings("deprecation")
public Object run()
{
SecurityContext sc;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationAuthenticator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationAuthenticator.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationAuthenticator.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -78,15 +78,15 @@
SecurityActions PRIVILEGED = new SecurityActions()
{
- private final PrivilegedAction getPrincipalAction = new PrivilegedAction()
+ private final PrivilegedAction<Principal> getPrincipalAction = new PrivilegedAction<Principal>()
{
- public Object run()
+ public Principal run()
{
return SecurityAssociation.getPrincipal();
}
};
- private final PrivilegedAction getCredentialAction = new PrivilegedAction()
+ private final PrivilegedAction<Object> getCredentialAction = new PrivilegedAction<Object>()
{
public Object run()
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityUtil.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityUtil.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -35,7 +35,6 @@
import org.jboss.security.identitytrust.IdentityTrustManager;
import org.jboss.security.mapping.MappingManager;
-//$Id$
/**
* Security Utility Class
@@ -78,12 +77,12 @@
{
if(theSubject == null)
throw new IllegalArgumentException("Subject is null");
- Set subjectGroups = theSubject.getPrincipals(Group.class);
- Iterator iter = subjectGroups.iterator();
+ Set<Group> subjectGroups = theSubject.getPrincipals(Group.class);
+ Iterator<Group> iter = subjectGroups.iterator();
Group roles = null;
while( iter.hasNext() )
{
- Group grp = (Group) iter.next();
+ Group grp = iter.next();
String name = grp.getName();
if( name.equals("Roles") )
roles = grp;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -29,6 +29,8 @@
import java.util.HashMap;
import java.util.Iterator;
+
+ at SuppressWarnings("unchecked")
/** An implementation of Group that manages a collection of Principal
objects based on their hashCode() and equals() methods. This class
is not thread safe.
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -126,8 +126,7 @@
/**
* @see AuthConfigFactory#getConfigProvider(String, String, RegistrationListener)
- */
- @SuppressWarnings("unchecked")
+ */
public AuthConfigProvider getConfigProvider(String layer, String appContext,
RegistrationListener listener)
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -36,7 +36,7 @@
*
* @author Scott.Stark at jboss.org
* @version $Revision$
- */
+ */
public class Users
{
private HashMap<String,User> users = new HashMap<String,User>();
@@ -80,8 +80,7 @@
{
this.encoding = encoding;
}
-
- @SuppressWarnings("unchecked")
+
public Group[] getRoleSets()
{
Group[] roleSets = new Group[roleGroups.size()];
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -102,8 +102,7 @@
* @param request
* @param sc
* @return
- */
- @SuppressWarnings("unchecked")
+ */
private int process(RoleGroup callerRoles)
{
int result = AuthorizationContext.DENY;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -115,8 +115,7 @@
* @param request
* @param sc
* @return
- */
- @SuppressWarnings("unchecked")
+ */
private int process(HttpServletRequest request, RoleGroup callerRoles )
{
Principal userP = request.getUserPrincipal();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -242,9 +242,7 @@
return isMember;
}
- /**
- *
- */
+ @Override
public String toString()
{
StringBuffer buf = new StringBuffer();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContext.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContext.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -284,6 +284,17 @@
this.callbackHandler = callbackHandler;
}
+
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("[").append(getClass().getCanonicalName()).append("()");
+ builder.append(this.securityDomain).append(")]");
+ return builder.toString();
+ }
+
+
@SuppressWarnings("unchecked")
@Override
public Object clone() throws CloneNotSupportedException
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/acl/JBossACLContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/acl/JBossACLContext.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/acl/JBossACLContext.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -143,8 +143,7 @@
am.initialize(this.sharedState,map);
return am;
}
-
- @SuppressWarnings("unchecked")
+
private <T> Set<T> invokeACL(Class<T> clazz, Resource resource, Identity identity)
throws AuthorizationException
{
@@ -199,4 +198,13 @@
}
modules.clear();
}
+
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("[").append(getClass().getCanonicalName()).append("()");
+ builder.append(this.securityDomainName).append(")]");
+ return builder.toString();
+ }
}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2008-09-23 15:09:16 UTC (rev 78789)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2008-09-23 15:45:14 UTC (rev 78790)
@@ -120,7 +120,6 @@
* @return AuthorizationContext.PERMIT or AuthorizationContext.DENY
* @throws AuthorizationException
*/
- @SuppressWarnings("unchecked")
public int authorize(final Resource resource) throws AuthorizationException
{
return this.authorize(resource, this.authenticatedSubject,
More information about the jboss-cvs-commits
mailing list