[jboss-cvs] JBossAS SVN: r68965 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss: crypto/digest and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 14 22:53:50 EST 2008
Author: anil.saldhana at jboss.com
Date: 2008-01-14 22:53:49 -0500 (Mon, 14 Jan 2008)
New Revision: 68965
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/CryptoUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/digest/DigestCallback.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AnybodyPrincipal.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AuthorizationInfo.java
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/NestableGroup.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NobodyPrincipal.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/AppCallbackHandler.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/MapCallback.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityAssociationHandler.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/FilePassword.java
Log:
add type info to collections
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/CryptoUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/CryptoUtil.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/CryptoUtil.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -474,13 +474,13 @@
try
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class keyGenClass = loader.loadClass("javax.crypto.KeyGenerator");
- Class[] sig = {String.class};
+ Class<?> keyGenClass = loader.loadClass("javax.crypto.KeyGenerator");
+ Class<?>[] sig = {String.class};
Object[] args = {"Blowfish"};
Method kgenInstance = keyGenClass.getDeclaredMethod("getInstance", sig);
Object kgen = kgenInstance.invoke(null, args);
- Class[] sig2 = {int.class};
+ Class<?>[] sig2 = {int.class};
Object[] args2 = {new Integer(256)};
Method init = keyGenClass.getDeclaredMethod("init", sig2);
init.invoke(kgen, args2);
@@ -500,14 +500,14 @@
*/
public static Object createSecretKey(String cipherAlgorithm, Object key) throws KeyException
{
- Class[] signature = {key.getClass(), String.class};
+ Class<?>[] signature = {key.getClass(), String.class};
Object[] args = {key, cipherAlgorithm};
Object secretKey = null;
try
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class secretKeySpecClass = loader.loadClass("javax.crypto.spec.SecretKeySpec");
- Constructor ctor = secretKeySpecClass.getDeclaredConstructor(signature);
+ Class<?> secretKeySpecClass = loader.loadClass("javax.crypto.spec.SecretKeySpec");
+ Constructor<?> ctor = secretKeySpecClass.getDeclaredConstructor(signature);
secretKey = ctor.newInstance(args);
}
catch(Exception e)
@@ -595,4 +595,4 @@
return data;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/digest/DigestCallback.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/digest/DigestCallback.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/crypto/digest/DigestCallback.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -39,7 +39,7 @@
* javax.security.auth.login.name - for the username
* javax.security.auth.login.password - for the String password
*/
- public void init(Map options);
+ public void init(Map<String,Object> options);
/**
* Pre-hash callout to allow for content before the password. Any content
* should be added using the MessageDigest update methods.
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AltClientLoginModule.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -68,7 +68,7 @@
private Subject subject;
private CallbackHandler callbackHandler;
/** Shared state between login modules */
- private Map sharedState;
+ private Map<String,?> sharedState;
/** Flag indicating if the shared password should be used */
private boolean useFirstPass;
private String username;
@@ -79,7 +79,7 @@
* Initialize this LoginModule.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
this.trace = log.isTraceEnabled();
this.subject = subject;
@@ -173,7 +173,7 @@
*/
public boolean commit() throws LoginException
{
- Set principals = subject.getPrincipals();
+ Set<Principal> principals = subject.getPrincipals();
Principal p = null;
Object credential = password;
if( useFirstPass == true )
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AnybodyPrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AnybodyPrincipal.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AnybodyPrincipal.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -34,7 +34,7 @@
@author Scott.Stark at jboss.org
@version $Revision$
*/
-public class AnybodyPrincipal implements Comparable, Principal
+public class AnybodyPrincipal implements Comparable<Object>, Principal
{
public static final String ANYBODY = "<ANYBODY>";
public static final AnybodyPrincipal ANYBODY_PRINCIPAL = new AnybodyPrincipal();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AuthorizationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AuthorizationInfo.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/AuthorizationInfo.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -39,9 +39,8 @@
*/
public class AuthorizationInfo
{
- private static Set emptySet = new HashSet();
- private ArrayList policyMap = new ArrayList();
- private PolicyEntry[] policyEntries;
+ private static Set<Principal> emptySet = new HashSet<Principal>();
+ private ArrayList<PolicyEntry> policyMap = new ArrayList<PolicyEntry>();
/** An inner class that represents a grant entry in policyMap. It is composed
*of a CodeSource and an array of Prinicpals along with the granted
@@ -51,9 +50,9 @@
{
private CodeSource cs;
private Principal[] principals;
- private ArrayList permissions;
+ private ArrayList<Permission> permissions;
- PolicyEntry(CodeSource cs, Principal[] principals, ArrayList permissions)
+ PolicyEntry(CodeSource cs, Principal[] principals, ArrayList<Permission> permissions)
{
this.cs = cs;
this.principals = principals;
@@ -70,7 +69,7 @@
}
}
- public boolean implies(CodeSource codesrc, Set subjectPrincipals)
+ public boolean implies(CodeSource codesrc, Set<Principal> subjectPrincipals)
{
boolean implies = false;
// Check codesources
@@ -164,7 +163,7 @@
public PermissionCollection getPermissions(Subject subject, CodeSource codesource)
{
PermissionCollection perms = new Permissions();
- Set subjectPrincipals = emptySet;
+ Set<Principal> subjectPrincipals = emptySet;
if( subject != null )
subjectPrincipals = subject.getPrincipals();
for(int n = 0; n < policyMap.size(); n ++)
@@ -182,11 +181,11 @@
return buffer.toString();
}
- public void grant(CodeSource cs, ArrayList permissions)
+ public void grant(CodeSource cs, ArrayList<Permission> permissions)
{
grant(cs, permissions, null);
}
- public void grant(CodeSource cs, ArrayList permissions, Principal[] principals)
+ public void grant(CodeSource cs, ArrayList<Permission> permissions, Principal[] principals)
{
PolicyEntry entry = new PolicyEntry(cs, principals, permissions);
policyMap.add(entry);
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-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/ClientLoginModule.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -77,7 +77,7 @@
/** The credential set during login() */
private Object loginCredential;
/** Shared state between login modules */
- private Map sharedState;
+ private Map<String,?> sharedState;
/** Flag indicating if the shared password should be used */
private boolean useFirstPass;
/** Flag indicating if the SecurityAssociation existing at login should
@@ -95,7 +95,7 @@
password-stacking
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
this.trace = log.isTraceEnabled();
this.subject = subject;
@@ -234,7 +234,7 @@
//SecurityAssociationActions.setPrincipalInfo(loginPrincipal, loginCredential, subject);
// Add the login principal to the subject if is not there
- Set principals = subject.getPrincipals();
+ Set<Principal> principals = subject.getPrincipals();
if (principals.contains(loginPrincipal) == false)
principals.add(loginPrincipal);
return true;
@@ -277,7 +277,7 @@
//SecurityAssociationActions.clear();
SecurityAssociationActions.setSecurityContext(null);
}
- Set principals = subject.getPrincipals();
+ Set<Principal> principals = subject.getPrincipals();
principals.remove(loginPrincipal);
return true;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -57,7 +57,7 @@
public NestableGroup(String name)
{
super(name);
- rolesStack = new LinkedList();
+ rolesStack = new LinkedList<Principal>();
}
// --- Begin Group interface methods
@@ -66,7 +66,7 @@
*/
public Enumeration<Principal> members()
{
- return new IndexEnumeration();
+ return new IndexEnumeration<Principal>();
}
/** Removes the first occurence of user from the Principal stack.
@@ -117,7 +117,7 @@
{
StringBuffer tmp = new StringBuffer(getName());
tmp.append("(members:");
- Enumeration iter = members();
+ Enumeration<Principal> iter = members();
while( iter.hasMoreElements() )
{
tmp.append(iter.nextElement());
@@ -127,6 +127,7 @@
return tmp.toString();
}
+ @SuppressWarnings("unchecked")
public synchronized Object clone() throws CloneNotSupportedException
{
NestableGroup clone = (NestableGroup) super.clone();
@@ -137,9 +138,9 @@
// --- End Group interface methods
- private class IndexEnumeration implements Enumeration
+ private class IndexEnumeration<T extends Principal> implements Enumeration<Principal>
{
- private Enumeration iter;
+ private Enumeration<? extends Principal> iter;
IndexEnumeration()
{
@@ -154,9 +155,9 @@
boolean hasMore = iter != null && iter.hasMoreElements();
return hasMore;
}
- public Object nextElement()
+ public Principal nextElement()
{
- Object next = null;
+ Principal next = null;
if( iter != null )
next = iter.nextElement();
return next;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -67,7 +67,7 @@
*/
public Enumeration<Principal> members()
{
- return new IndexEnumeration();
+ return new IndexEnumeration<Principal>();
}
/** Removes the first occurence of user from the Principal stack.
@@ -110,7 +110,8 @@
return member.equals(activePrincipal);
}
- public synchronized Object clone() throws CloneNotSupportedException
+ @SuppressWarnings("unchecked")
+ public synchronized Object clone() throws CloneNotSupportedException
{
NestablePrincipal clone = (NestablePrincipal) super.clone();
if(clone != null)
@@ -120,7 +121,7 @@
// --- End Group interface methods
- private class IndexEnumeration implements Enumeration
+ private class IndexEnumeration<T extends Principal> implements Enumeration<Principal>
{
private boolean hasMoreElements;
@@ -132,9 +133,9 @@
{
return hasMoreElements;
}
- public Object nextElement()
+ public Principal nextElement()
{
- Object next = principalStack.getFirst();
+ Principal next = principalStack.getFirst();
hasMoreElements = false;
return next;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NobodyPrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NobodyPrincipal.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NobodyPrincipal.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -34,7 +34,7 @@
@author Scott.Stark at jboss.org
@version $Revision$
*/
-public class NobodyPrincipal implements Comparable, Principal
+public class NobodyPrincipal implements Comparable<Object>, Principal
{
public static final String NOBODY = "<NOBODY>";
public static final NobodyPrincipal NOBODY_PRINCIPAL = new NobodyPrincipal();
@@ -79,4 +79,4 @@
return 1;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -143,6 +143,7 @@
return "[roles=" + runAsRoles + ",principal=" + getName() + "]";
}
+ @SuppressWarnings("unchecked")
public synchronized Object clone() throws CloneNotSupportedException
{
RunAsIdentity clone = (RunAsIdentity) super.clone();
@@ -155,11 +156,13 @@
return clone;
}
+ @SuppressWarnings("unchecked")
public <T> T getIdentity()
{
return (T) getName();
}
+ @SuppressWarnings("unchecked")
public <T> T getProof()
{
return (T) SecurityConstants.JAVAEE;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityActions.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityActions.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -38,10 +38,10 @@
{
public String getProperty(final String name, final String defaultValue)
{
- String prop = (String) AccessController.doPrivileged(
- new PrivilegedAction()
+ String prop = AccessController.doPrivileged(
+ new PrivilegedAction<String>()
{
- public Object run()
+ public String run()
{
String p = System.getProperty(name, defaultValue);
return p;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/audit/config/AuditConfigEntryHolder.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -39,7 +39,7 @@
*/
public class AuditConfigEntryHolder implements GenericValueContainer
{
- private Map moduleOptions = new HashMap();
+ private Map<String,Object> moduleOptions = new HashMap<String,Object>();
String moduleName = null;
public void addChild(QName name, Object value)
@@ -71,8 +71,8 @@
return entry;
}
- public Class getTargetClass()
+ public Class<?> getTargetClass()
{
return AuditProviderEntry.class;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/AppCallbackHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/AppCallbackHandler.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/AppCallbackHandler.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -65,7 +65,7 @@
private transient String prompt;
private transient Object credential;
- private Map keyValuePair;
+ private Map<String,Object> keyValuePair;
/** Whether this handler gets the username/password from the console */
private boolean consoleHandler = false;
@@ -122,7 +122,7 @@
*
* @param mapOfValues Key Value Pair
*/
- public AppCallbackHandler(Map mapOfValues)
+ public AppCallbackHandler(Map<String,Object> mapOfValues)
{
this.keyValuePair = mapOfValues;
}
@@ -201,7 +201,7 @@
MapCallback mc = (MapCallback) c;
if(keyValuePair != null && !keyValuePair.isEmpty())
{
- Iterator iter = keyValuePair.keySet().iterator();
+ Iterator<?> iter = keyValuePair.keySet().iterator();
while(iter.hasNext())
{
Object key = iter.next();
@@ -278,7 +278,7 @@
{
try
{
- Class[] types = {};
+ Class<?>[] types = {};
Method m = credential.getClass().getMethod("toCharArray", types);
Object[] args = {};
password = (char[]) m.invoke(credential, args);
@@ -294,4 +294,4 @@
}
return password;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -35,7 +35,7 @@
public class CallbackHandlerPolicyContextHandler implements PolicyContextHandler
{
public static final String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
- private static ThreadLocal requestContext = new ThreadLocal();
+ private static ThreadLocal<CallbackHandler> requestContext = new ThreadLocal<CallbackHandler>();
public static void setCallbackHandler(CallbackHandler bean)
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/MapCallback.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/MapCallback.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/MapCallback.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -34,7 +34,7 @@
*/
public class MapCallback implements Callback
{
- private Map info = new HashMap();
+ private Map<String,Object> info = new HashMap<String,Object>();
public Object getInfo(String key)
{
@@ -44,4 +44,4 @@
{
info.put(key, value);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityActions.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityActions.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -44,9 +44,9 @@
public static final String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
PolicyContextActions PRIVILEGED = new PolicyContextActions()
{
- private final PrivilegedExceptionAction exAction = new PrivilegedExceptionAction()
+ private final PrivilegedExceptionAction<CallbackHandler> exAction = new PrivilegedExceptionAction<CallbackHandler>()
{
- public Object run() throws Exception
+ public CallbackHandler run() throws Exception
{
return (CallbackHandler) PolicyContext.getContext(CALLBACK_HANDLER_KEY);
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityAssociationHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityAssociationHandler.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/callback/SecurityAssociationHandler.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -158,7 +158,7 @@
{
try
{
- Class[] types = {};
+ Class<?>[] types = {};
Method m = credential.getClass().getMethod("toCharArray", types);
Object[] args = {};
password = (char[]) m.invoke(credential, args);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -64,7 +64,7 @@
*/
public static Group addRoles(Group roles, String[] addRoles)
{
- Class pClass = getPrincipalClass(roles);
+ Class<?> pClass = getPrincipalClass(roles);
for(String str:addRoles)
{
roles.addMember(instantiatePrincipal(pClass,str));
@@ -98,12 +98,12 @@
* @param role Name of the role
* @return
*/
- public static Principal instantiatePrincipal(Class cls, String role)
+ public static Principal instantiatePrincipal(Class<?> cls, String role)
{
Principal p = null;
try
{
- Constructor ctr = cls.getConstructor(new Class[] {String.class});
+ Constructor<?> ctr = cls.getConstructor(new Class[] {String.class});
p = (Principal)ctr.newInstance(new Object[]{role});
}
catch (Exception e)
@@ -142,7 +142,7 @@
public static Group removeRoles(Group roles, String[] removeRoles)
{
//Assume that the roles all belong to the same principal class
- Class pClass = getPrincipalClass(roles);
+ Class<?> pClass = getPrincipalClass(roles);
for(String str:removeRoles)
{
roles.removeMember(instantiatePrincipal(pClass,str));
@@ -161,10 +161,10 @@
return addPrincipals( removePrincipals(fg),sg.members());
}
- private static Class getPrincipalClass(Group roles)
+ private static Class<?> getPrincipalClass(Group roles)
{
//Assume that the roles all belong to the same principal class
- Class principalClass = SimplePrincipal.class;
+ Class<?> principalClass = SimplePrincipal.class;
Enumeration<? extends Principal> en = roles.members();
if(en.hasMoreElements())
{
@@ -172,4 +172,4 @@
}
return principalClass;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -13,7 +13,6 @@
import java.util.Map;
import java.util.Properties;
-import org.jboss.logging.Logger;
import org.jboss.security.mapping.MappingProvider;
import org.jboss.security.mapping.MappingResult;
@@ -26,16 +25,14 @@
* @since Aug 24, 2006
*/
public class OptionsRoleMappingProvider implements MappingProvider<Group>
-{
- private static final Logger log = Logger.getLogger(OptionsRoleMappingProvider.class);
-
+{
//Standard Strings
private static final String REPLACE_ROLES_STRING = "replaceRoles";
private static final String ROLES_MAP = "rolesMap";
private MappingResult<Group> result;
- private Map options = null;
+ private Map<String,Object> options = null;
private Properties roleMapProperties = null;
@@ -44,7 +41,7 @@
*/
private boolean REPLACE_ROLES = false;
- public void init(Map opt)
+ public void init(Map<String,Object> opt)
{
this.options = opt;
if(options != null)
@@ -60,18 +57,18 @@
}
}
- public void setMappingResult(MappingResult res)
+ public void setMappingResult(MappingResult<Group> res)
{
result = res;
}
- public void performMapping(Map contextMap, Group mappedObject)
+ public void performMapping(Map<String,Object> contextMap, Group mappedObject)
{
ArrayList<Principal> removeMembers = new ArrayList<Principal>();
ArrayList<Principal> addMembers = new ArrayList<Principal>();
//Enumerate over the members
- Enumeration enumer = mappedObject.members();
+ Enumeration<? extends Principal> enumer = mappedObject.members();
while(enumer.hasMoreElements())
{
Principal p = (Principal)enumer.nextElement();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -51,7 +51,7 @@
private static Logger log = Logger.getLogger(PolicyContextIdRoleMappingProvider.class);
private boolean trace = log.isTraceEnabled();
- private Map options = null;
+ private Map<String,Object> options = null;
private MappingResult<Group> result;
private Properties policyContextIdToFileNameProps = new Properties();
@@ -59,7 +59,7 @@
private static final String PROPERTIES_ID = "map";
private static final String EXTERNAL_ID = "externalProperties";
- public void init(Map opt)
+ public void init(Map<String,Object> opt)
{
this.options = opt;
if(trace)
@@ -87,12 +87,13 @@
}
}
- public void setMappingResult(MappingResult res)
+ public void setMappingResult(MappingResult<Group> res)
{
result = res;
}
- public void performMapping(Map contextMap, Group mappedObject)
+ @SuppressWarnings("unchecked")
+ public void performMapping(Map<String,Object> contextMap, Group mappedObject)
{
ArrayList <Principal> tempPrincipalList = new ArrayList<Principal>();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -46,12 +46,12 @@
//Standard Strings
private static final String PRINCIPAL_ROLES_MAP = "principalRolesMap";
- private Map options = null;
+ private Map<String,Object> options = null;
private MappingResult<Group> result;
private Properties principalRoleMapProperties = null;
- public void init(Map opt)
+ public void init(Map<String,Object> opt)
{
this.options = opt;
if(log.isTraceEnabled())
@@ -65,12 +65,13 @@
}
}
- public void setMappingResult(MappingResult res)
+ public void setMappingResult(MappingResult<Group> res)
{
result = res;
}
- public void performMapping(Map contextMap, Group mappedObject)
+ @SuppressWarnings("unchecked")
+ public void performMapping(Map<String,Object> contextMap, Group mappedObject)
{
Set<Principal> principals = (Set<Principal>) contextMap.get(SecurityConstants.PRINCIPALS_SET_IDENTIFIER);
for(Principal p:principals)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -43,9 +43,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();
}
@@ -54,9 +54,9 @@
static URL findResource(final URLClassLoader cl, final String name)
{
- return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<URL>()
{
- public Object run()
+ public URL run()
{
return cl.findResource(name);
}
@@ -65,9 +65,9 @@
static Policy getPolicy()
{
- return (Policy) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<Policy>()
{
- public Object run()
+ public Policy run()
{
return Policy.getPolicy();
}
@@ -76,9 +76,9 @@
static URL getResource(final ClassLoader cl, final String name)
{
- return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<URL>()
{
- public Object run()
+ public URL run()
{
return cl.getResource(name);
}
@@ -87,9 +87,9 @@
static InputStream openStream(final URL url) throws PrivilegedActionException
{
- return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>()
{
- public Object run() throws IOException
+ public InputStream run() throws IOException
{
return url.openStream();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/FilePassword.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/FilePassword.java 2008-01-15 03:48:38 UTC (rev 68964)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/FilePassword.java 2008-01-15 03:53:49 UTC (rev 68965)
@@ -21,8 +21,6 @@
*/
package org.jboss.security.plugins;
-import static org.jboss.security.plugins.FilePassword.main;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
More information about the jboss-cvs-commits
mailing list