From 5cb7575b2b0f0b56b388b43a1bfbc18b6b50b6e9 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 5 Nov 2005 18:49:55 +0000 Subject: [PATCH] Corrected references to old context class names in Javadoc and logging. --- ...nticationCredentialsNotFoundException.java | 3 +-- .../java/org/acegisecurity/RunAsManager.java | 12 +++++------ .../HttpSessionContextIntegrationFilter.java | 18 ++++++++--------- .../context/SecurityContext.java | 2 +- .../context/SecurityContextHolder.java | 4 ++-- .../context/SecurityContextImpl.java | 4 +--- ...ationSimpleHttpInvokerRequestExecutor.java | 8 ++++---- .../ContextPropagatingRemoteInvocation.java | 2 +- ...uthenticationCredentialsNotFoundEvent.java | 2 +- .../AuthorizationFailureEvent.java | 4 ++-- .../authorization/PublicInvocationEvent.java | 6 +++--- .../anonymous/AnonymousProcessingFilter.java | 17 ++++++++-------- .../jaas/SecureContextLoginModule.java | 13 ++++++------ .../acegisecurity/taglibs/authz/AclTag.java | 2 +- .../ui/basicauth/BasicProcessingFilter.java | 2 +- .../ui/digestauth/DigestProcessingFilter.java | 20 +++++++++---------- .../RememberMeProcessingFilter.java | 13 ++++++------ .../ui/rememberme/RememberMeServices.java | 2 +- .../TokenBasedRememberMeServices.java | 2 +- .../SwitchUserProcessingFilter.java | 4 ++-- .../ui/x509/X509ProcessingFilter.java | 4 ++-- .../ContextHolderAwareRequestWrapper.java | 4 ++-- ...ntextPropagatingRemoteInvocationTests.java | 2 +- .../web/SecurityEnforcementFilterTests.java | 4 ++-- .../AnonymousProcessingFilterTests.java | 2 +- .../jaas/SecureContextLoginModuleTests.java | 6 +++--- .../RememberMeProcessingFilterTests.java | 2 +- 27 files changed, 80 insertions(+), 84 deletions(-) diff --git a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java index cf720c4c1c..c63f3862fb 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java +++ b/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java @@ -17,8 +17,7 @@ package net.sf.acegisecurity; /** * Thrown if an authentication request is rejected because there is no {@link - * Authentication} object in the {@link - * net.sf.acegisecurity.context.security.SecureContext}. + * Authentication} object in the {@link net.sf.acegisecurity.context.SecurityContext SecurityContext}. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/RunAsManager.java b/core/src/main/java/org/acegisecurity/RunAsManager.java index 5d496dfa56..b2e36ab36a 100644 --- a/core/src/main/java/org/acegisecurity/RunAsManager.java +++ b/core/src/main/java/org/acegisecurity/RunAsManager.java @@ -19,18 +19,18 @@ package net.sf.acegisecurity; * Creates a new temporary {@link Authentication} object for the current secure * object invocation only. * - *

+ *

* This interface permits implementations to replace the * Authentication object that applies to the current secure * object invocation only. The {@link * net.sf.acegisecurity.intercept.AbstractSecurityInterceptor} will replace - * the Authentication object held in the {@link - * net.sf.acegisecurity.context.security.SecureContext} for the duration of - * the secure object callback only, returning it to the original - * Authentication object when the callback ends. + * the Authentication object held in the + * {@link net.sf.acegisecurity.context.SecurityContext SecurityContext} + * for the duration of the secure object callback only, returning it to + * the original Authentication object when the callback ends. *

* - *

+ *

* This is provided so that systems with two layers of objects can be * established. One layer is public facing and has normal secure methods with * the granted authorities expected to be held by external callers. The other diff --git a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java index d1767856bb..494fd9ddcc 100644 --- a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java +++ b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java @@ -34,7 +34,7 @@ import javax.servlet.http.HttpSession; /** *

- * Populates the SecurityContextHolder with information obtained + * Populates the {@link SecurityContextHolder} with information obtained * from the HttpSession. *

* @@ -60,15 +60,15 @@ import javax.servlet.http.HttpSession; * No HttpSession will be created by this filter if one does not * already exist. If at the end of the web request the * HttpSession does not exist, a HttpSession will - * only be created if the current contents of - * ContextHolder are not {@link + * only be created if the current contents of the + * SecurityContextHolder are not {@link * java.lang.Object#equals(java.lang.Object)} to a new instance * of {@link #setContext(Class)}. This avoids needless * HttpSession creation, but automates the storage of changes - * made to the ContextHolder. + * made to the SecurityContextHolder. *

* - *

+ *

* This filter will only execute once per request, to resolve servlet container * (specifically Weblogic) incompatibilities. *

@@ -79,16 +79,16 @@ import javax.servlet.http.HttpSession; * similar clients that will never present the same jsessionid * etc), the {@link #setAllowSessionCreation(boolean)} should be set to * false. Only do this if you really need to conserve server - * memory and ensure all classes using the ContextHolder are - * designed to have no persistence of the Context between web + * memory and ensure all classes using the SecurityContextHolder are + * designed to have no persistence of the SecurityContext between web * requests. *

* *

* This filter MUST be executed BEFORE any authentication procesing mechanisms. * Authentication processing mechanisms (eg BASIC, CAS processing filters etc) - * expect the ContextHolder to contain a valid - * SecureContext by the time they execute. + * expect the SecurityContextHolder to contain a valid + * SecurityContext by the time they execute. *

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContext.java b/core/src/main/java/org/acegisecurity/context/SecurityContext.java index 2dea70fe8f..c8d4d8f059 100644 --- a/core/src/main/java/org/acegisecurity/context/SecurityContext.java +++ b/core/src/main/java/org/acegisecurity/context/SecurityContext.java @@ -25,7 +25,7 @@ import java.io.Serializable; * current thread of execution. * *

- * Stored in {@link net.sf.acegisecurity.context.SecurityContextHolder}. + * The security context is stored in a {@link SecurityContextHolder}. *

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java index 0ab45808a3..bc5287a0ff 100644 --- a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java +++ b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java @@ -20,10 +20,10 @@ import org.springframework.util.Assert; /** * Associates a given {@link SecurityContext} with the current execution - * thread, along with new threads the current execution thread may spawn. + * thread and any new threads the current execution thread may spawn. * *

- * To guarantee the {@link #getContext()} never returns null, this + * To guarantee that {@link #getContext()} never returns null, this * class defaults to returning SecurityContextImpl if no * SecurityContext has ever been associated with the current * thread of execution. Despite this behaviour, in general another class will diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java b/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java index e09ebad1b5..0a43460a81 100644 --- a/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java +++ b/core/src/main/java/org/acegisecurity/context/SecurityContextImpl.java @@ -21,9 +21,7 @@ import net.sf.acegisecurity.Authentication; * Base implementation of {@link SecurityContext}. * *

- * Used by default by {@link - * net.sf.acegisecurity.context.SecurityContextHolder} and {@link - * net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter}. + * Used by default by {@link SecurityContextHolder} and {@link HttpSessionContextIntegrationFilter}. *

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java index 4bb28250c3..021a452248 100644 --- a/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java +++ b/core/src/main/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java @@ -61,14 +61,14 @@ public class AuthenticationSimpleHttpInvokerRequestExecutor /** * Called every time a HTTP invocation is made. * - *

+ *

* Simply allows the parent to setup the connection, and then adds an * Authorization HTTP header property that will be used for * BASIC authentication. *

* - *

- * The ContextHolder is used to obtain the relevant principal + *

+ * The SecurityContextHolder is used to obtain the relevant principal * and credentials. *

* @@ -77,7 +77,7 @@ public class AuthenticationSimpleHttpInvokerRequestExecutor * * @throws IOException if thrown by HttpURLConnection methods * @throws AuthenticationCredentialsNotFoundException if the - * ContextHolder does not contain a valid + * SecurityContextHolder does not contain a valid * Authentication with both its * principal and credentials not * null diff --git a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java index 404dff74ba..7c7683781d 100644 --- a/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java +++ b/core/src/main/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocation.java @@ -32,7 +32,7 @@ import java.lang.reflect.InvocationTargetException; /** * The actual RemoteInvocation that is passed from the client to * the server, which contains the contents of {@link SecurityContextHolder}, - * being a {@link SecureContext} object. + * being a {@link SecurityContext} object. * *

* When constructed on the client via {@link diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java index a14406f08b..f5be7f295e 100644 --- a/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java +++ b/core/src/main/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEvent.java @@ -22,7 +22,7 @@ import net.sf.acegisecurity.ConfigAttributeDefinition; /** * Indicates a secure object invocation failed because the * Authentication could not be obtained from the - * ContextHolder. + * SecurityContextHolder. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java index d5e1348cad..160f88f28d 100644 --- a/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java +++ b/core/src/main/java/org/acegisecurity/event/authorization/AuthorizationFailureEvent.java @@ -41,11 +41,11 @@ public class AuthorizationFailureEvent extends AbstractAuthorizationEvent { * * @param secureObject the secure object * @param configAttribs that apply to the secure object - * @param authentication that was found on the ContextHolder + * @param authentication that was found in the SecurityContextHolder * @param accessDeniedException that was returned by the * AccessDecisionManager * - * @throws IllegalArgumentException DOCUMENT ME! + * @throws IllegalArgumentException if any null arguments are presented. */ public AuthorizationFailureEvent(Object secureObject, ConfigAttributeDefinition configAttribs, Authentication authentication, diff --git a/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java b/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java index e56c8e7cda..d1d268915b 100644 --- a/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java +++ b/core/src/main/java/org/acegisecurity/event/authorization/PublicInvocationEvent.java @@ -18,14 +18,14 @@ package net.sf.acegisecurity.event.authorization; /** * Event that is generated whenever a public secure object is invoked. * - *

+ *

* A public secure object is a secure object that has no * ConfigAttributeDefinition defined. A public secure object will - * not cause the ContextHolder to be inspected or authenticated, + * not cause the SecurityContextHolder to be inspected or authenticated, * and no authorization will take place. *

* - *

+ *

* Published just before the secure object attempts to proceed. *

* diff --git a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java index d0b7a9ca7f..8a434912b4 100644 --- a/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilter.java @@ -39,8 +39,8 @@ import javax.servlet.ServletResponse; * Detects if there is no Authentication object in the * SecurityContextHolder, and populates it with one if needed. * - *

- * Do not use this class directly. Instead configure + *

+ * Do not use this class directly. Instead configure * web.xml to use the {@link * net.sf.acegisecurity.util.FilterToBeanProxy}. *

@@ -93,14 +93,14 @@ public class AnonymousProcessingFilter implements Filter, InitializingBean { if (logger.isDebugEnabled()) { logger.debug( - "Replaced SecurityContextHolder with anonymous token: '" + + "Populated SecurityContextHolder with anonymous token: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } } else { if (logger.isDebugEnabled()) { logger.debug( - "SecurityContextHolder not replaced with anonymous token, as ContextHolder already contained: '" + + "SecurityContextHolder not populated with anonymous token, as it already contained: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } @@ -119,11 +119,10 @@ public class AnonymousProcessingFilter implements Filter, InitializingBean { /** * Does nothing - we reply on IoC lifecycle services instead. * - * @param arg0 DOCUMENT ME! + * @param ignored not used * - * @throws ServletException DOCUMENT ME! */ - public void init(FilterConfig arg0) throws ServletException { + public void init(FilterConfig ignored) throws ServletException { } /** @@ -157,8 +156,8 @@ public class AnonymousProcessingFilter implements Filter, InitializingBean { * Controls whether the filter will remove the Anonymous token * after the request is complete. Generally this is desired to * avoid the expense of a session being created by - * {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter} simply - * to store the Anonymous authentication token. + * {@link net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter HttpSessionContextIntegrationFilter} + * simply to store the Anonymous authentication token. * *

Defaults to true, * being the most optimal and appropriate option (ie AnonymousProcessingFilter diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/SecureContextLoginModule.java b/core/src/main/java/org/acegisecurity/providers/jaas/SecureContextLoginModule.java index 73374669d6..92f3cc4f6c 100644 --- a/core/src/main/java/org/acegisecurity/providers/jaas/SecureContextLoginModule.java +++ b/core/src/main/java/org/acegisecurity/providers/jaas/SecureContextLoginModule.java @@ -30,15 +30,16 @@ import javax.security.auth.spi.LoginModule; /** - * An implementation of {@link LoginModule} that uses an Acegi Security {@link - * SecureContext} to provide authentication.
+ * An implementation of {@link LoginModule} that uses an Acegi Security + * {@link net.sf.acegisecurity.context.SecurityContext SecurityContext} + * to provide authentication.
* This LoginModule provides opposite functionality to the {@link * JaasAuthenticationProvider} API, and should not really be used in - * conjunction.
+ * conjunction with it.
* The {@link JaasAuthenticationProvider} allows Acegi to authenticate against - * Jaas.
+ * Jaas.
* The SecureContextLoginModule allows a Jaas based application to - * authenticate against Acegi. If there is no Authentication in the {@link + * authenticate against Acegi. If there is no Authentication in the {@link * SecurityContextHolder} the login() method will throw a LoginException by * default. This functionality can be changed with the * ignoreMissingAuthentication option by setting it to "true". @@ -126,7 +127,7 @@ public class SecureContextLoginModule implements LoginModule { /** * Authenticate the Subject (phase one) by extracting the * Acegi Security Authentication from the current - * SecureContext. + * SecurityContext. * * @return true if the authentication succeeded, or false if this * LoginModule should be ignored. diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java index 4b3a3087a7..e7353cc5c6 100644 --- a/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java +++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AclTag.java @@ -54,7 +54,7 @@ import javax.servlet.jsp.tagext.TagSupport; * One or more comma separate integer permissions are specified via the * hasPermission attribute. The tag will include its body if * any of the integer permissions have been granted to the current - * Authentication (obtained from the ContextHolder). + * Authentication (obtained from the SecurityContextHolder). *

* *

diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java index 41aab01b39..bf43def67f 100644 --- a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java @@ -172,7 +172,7 @@ public class BasicProcessingFilter implements Filter, InitializingBean { password = token.substring(delim + 1); } - // Only reauthenticate if username doesn't match ContextHolder and user isn't authenticated (see SEC-53) + // Only reauthenticate if username doesn't match SecurityContextHolder and user isn't authenticated (see SEC-53) Authentication existingAuth = SecurityContextHolder.getContext() .getAuthentication(); diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java index fa5ba1d490..039a3b98a7 100644 --- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java @@ -54,11 +54,11 @@ import javax.servlet.http.HttpServletResponse; /** * Processes a HTTP request's Digest authorization headers, putting the result - * into the ContextHolder. + * into the SecurityContextHolder. * - *

+ *

* For a detailed background on what this filter is designed to process, refer - * to RFC 2617 (which + * to RFC 2617 (which * superseded RFC 2069, although this filter support clients that implement * either RFC 2617 or RFC 2069). *

@@ -72,18 +72,18 @@ import javax.servlet.http.HttpServletResponse; *

* This Digest implementation has been designed to avoid needing to store * session state between invocations. All session management information is - * stored in the "nonce" that is sent to the client by the {@link - * net.sf.acegisecurity.ui.digestauth.DigestProcessingFilterEntryPoint}. + * stored in the "nonce" that is sent to the client by the {@link DigestProcessingFilterEntryPoint}. *

* *

- * If authentication is successful, the resulting {@link Authentication} object - * will be placed into the ContextHolder. + * If authentication is successful, the resulting {@link net.sf.acegisecurity.Authentication Authentication} + * object will be placed into the SecurityContextHolder. *

* *

- * If authentication fails, an {@link AuthenticationEntryPoint} implementation - * is called. This must always be {@link DigestProcessingFilterEntryPoint}, + * If authentication fails, an + * {@link net.sf.acegisecurity.intercept.web.AuthenticationEntryPoint AuthenticationEntryPoint} + * implementation is called. This must always be {@link DigestProcessingFilterEntryPoint}, * which will prompt the user to authenticate again via Digest authentication. *

* @@ -432,7 +432,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean { return userCache; } - public void init(FilterConfig arg0) throws ServletException {} + public void init(FilterConfig ignored) throws ServletException {} private void fail(ServletRequest request, ServletResponse response, AuthenticationException failed) throws IOException, ServletException { diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java index 187fcbb58d..f21db76c63 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java @@ -65,8 +65,8 @@ import javax.servlet.http.HttpServletResponse; * via an AuthenticationManager-specific application event. *

* - *

- * Do not use this class directly. Instead configure + *

+ * Do not use this class directly. Instead configure * web.xml to use the {@link * net.sf.acegisecurity.util.FilterToBeanProxy}. *

@@ -130,7 +130,7 @@ public class RememberMeProcessingFilter implements Filter, InitializingBean, if (logger.isDebugEnabled()) { logger.debug( - "Replaced SecurityContextHolder with remember-me token: '" + "SecurityContextHolder populated with remember-me token: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } @@ -145,7 +145,7 @@ public class RememberMeProcessingFilter implements Filter, InitializingBean, } else { if (logger.isDebugEnabled()) { logger.debug( - "SecurityContextHolder not replaced with remember-me token, as SecurityContextHolder already contained: '" + "SecurityContextHolder not populated with remember-me token, as it already contained: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } @@ -157,9 +157,8 @@ public class RememberMeProcessingFilter implements Filter, InitializingBean, /** * Does nothing - we rely on IoC lifecycle services instead. * - * @param arg0 not used + * @param ignored not used * - * @throws ServletException not thrown */ - public void init(FilterConfig arg0) throws ServletException {} + public void init(FilterConfig ignored) throws ServletException {} } diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java index e4fc0ec08b..2fa4d4d171 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java +++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java @@ -54,7 +54,7 @@ public interface RememberMeServices { //~ Methods ================================================================ /** - * This method will be called whenever the ContextHolder does + * This method will be called whenever the SecurityContextHolder does * not contain an Authentication and the Acegi Security * system wishes to provide an implementation with an opportunity to * authenticate the request using remember-me capabilities. Acegi Security diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java index 4df866b9be..9bcbe0e29e 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java +++ b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java @@ -238,7 +238,7 @@ public class TokenBasedRememberMeServices implements RememberMeServices, // Must do this after user lookup, as we need the DAO-derived password // If efficiency was a major issue, just add in a UserCache implementation, // but recall this method is usually only called one per HttpSession - // (as if the token is valid, it will cause ContextHolder population, whilst + // (as if the token is valid, it will cause SecurityContextHolder population, whilst // if invalid, will cause the cookie to be cancelled) String expectedTokenSignature = DigestUtils.md5Hex(userDetails .getUsername() + ":" + tokenExpiryTime + ":" diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java index ac14bf9291..33ec0f4543 100644 --- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java @@ -78,7 +78,7 @@ import javax.servlet.http.HttpServletResponse; *

* *

- * On successful switch, the user's SecureContextHolder will be + * On successful switch, the user's SecurityContextHolder will be * updated to reflect the specified user and will also contain an additinal * {@link net.sf.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority } * which contains the original user. @@ -224,7 +224,7 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, chain.doFilter(request, response); } - public void init(FilterConfig filterConfig) throws ServletException {} + public void init(FilterConfig ignored) throws ServletException {} /** * Attempt to exit from an already switched user. diff --git a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java index 82b92cbc0d..5fa5949499 100644 --- a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java @@ -165,7 +165,7 @@ public class X509ProcessingFilter implements Filter, InitializingBean, filterChain.doFilter(request, response); } - public void init(FilterConfig filterConfig) throws ServletException {} + public void init(FilterConfig ignored) throws ServletException {} /** * Puts the Authentication instance returned by the @@ -206,7 +206,7 @@ public class X509ProcessingFilter implements Filter, InitializingBean, SecurityContextHolder.getContext().setAuthentication(null); if (logger.isDebugEnabled()) { - logger.debug("Updated ContextHolder to contain null Authentication"); + logger.debug("Updated SecurityContextHolder to contain null Authentication"); } request.getSession().setAttribute(AbstractProcessingFilter.ACEGI_SECURITY_LAST_EXCEPTION_KEY, diff --git a/core/src/main/java/org/acegisecurity/wrapper/ContextHolderAwareRequestWrapper.java b/core/src/main/java/org/acegisecurity/wrapper/ContextHolderAwareRequestWrapper.java index a93d8af681..58c432190c 100644 --- a/core/src/main/java/org/acegisecurity/wrapper/ContextHolderAwareRequestWrapper.java +++ b/core/src/main/java/org/acegisecurity/wrapper/ContextHolderAwareRequestWrapper.java @@ -53,7 +53,7 @@ public class ContextHolderAwareRequestWrapper extends HttpServletRequestWrapper /** * Returns the principal's name, as obtained from the - * ContextHolder. Properly handles both + * SecurityContextHolder. Properly handles both * String-based and UserDetails-based * principals. * @@ -78,7 +78,7 @@ public class ContextHolderAwareRequestWrapper extends HttpServletRequestWrapper * GrantedAuthority#getAuthority()}. * *

- * Will always return false if the ContextHolder + * Will always return false if the SecurityContextHolder * contains an Authentication with * nullprincipal and/or * GrantedAuthority[] objects. diff --git a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java b/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java index 5de7e50851..fd9043acab 100644 --- a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java +++ b/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java @@ -69,7 +69,7 @@ public class ContextPropagatingRemoteInvocationTests extends TestCase { SecurityContextHolder.setContext(new SecurityContextImpl()); // The result from invoking the TargetObject should contain the - // Authentication class delivered via the ContextHolder + // Authentication class delivered via the SecurityContextHolder assertEquals("some_string net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken false", remoteInvocation.invoke(new TargetObject())); } diff --git a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java b/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java index 62a36ce286..91eb086a88 100644 --- a/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java +++ b/core/src/test/java/org/acegisecurity/intercept/web/SecurityEnforcementFilterTests.java @@ -83,7 +83,7 @@ public class SecurityEnforcementFilterTests extends TestCase { MockFilterSecurityInterceptor interceptor = new MockFilterSecurityInterceptor(true, false, false, false); - // Setup ContextHolder, as filter needs to check if user is anonymous + // Setup SecurityContextHolder, as filter needs to check if user is anonymous SecurityContextHolder.getContext().setAuthentication(new AnonymousAuthenticationToken( "ignored", "ignored", new GrantedAuthority[] {new GrantedAuthorityImpl("IGNORED")})); @@ -113,7 +113,7 @@ public class SecurityEnforcementFilterTests extends TestCase { MockFilterSecurityInterceptor interceptor = new MockFilterSecurityInterceptor(true, false, false, false); - // Setup ContextHolder, as filter needs to check if user is anonymous + // Setup SecurityContextHolder, as filter needs to check if user is anonymous SecurityContextHolder.getContext().setAuthentication(null); // Test diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java index a94015fc35..39986a047b 100644 --- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java +++ b/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java @@ -104,7 +104,7 @@ public class AnonymousProcessingFilterTests extends TestCase { public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception { - // Put an Authentication object into the ContextHolder + // Put an Authentication object into the SecurityContextHolder Authentication originalAuth = new TestingAuthenticationToken("user", "password", new GrantedAuthority[] { new GrantedAuthorityImpl("ROLE_A") }); diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/SecureContextLoginModuleTests.java b/core/src/test/java/org/acegisecurity/providers/jaas/SecureContextLoginModuleTests.java index ac491092c8..7381bcf641 100644 --- a/core/src/test/java/org/acegisecurity/providers/jaas/SecureContextLoginModuleTests.java +++ b/core/src/test/java/org/acegisecurity/providers/jaas/SecureContextLoginModuleTests.java @@ -30,7 +30,7 @@ import javax.security.auth.login.LoginException; /** - * DOCUMENT ME! + * Testst SecureContextLoginModule * * @author Ray Krueger */ @@ -57,7 +57,7 @@ public class SecureContextLoginModuleTests extends TestCase { try { module.login(); fail( - "LoginException expected, there is no Authentication in the SecureContext"); + "LoginException expected, there is no Authentication in the SecurityContext"); } catch (LoginException e) {} } @@ -87,7 +87,7 @@ public class SecureContextLoginModuleTests extends TestCase { try { SecurityContextHolder.getContext().setAuthentication(null); module.login(); - fail("LoginException expected, the authentication is null in the SecureContext"); + fail("LoginException expected, the authentication is null in the SecurityContext"); } catch (Exception e) { } } diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java index fa401bcd15..575c569d67 100644 --- a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java +++ b/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java @@ -118,7 +118,7 @@ public class RememberMeProcessingFilterTests extends TestCase { public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception { - // Put an Authentication object into the ContextHolder + // Put an Authentication object into the SecurityContextHolder Authentication originalAuth = new TestingAuthenticationToken("user", "password", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_A")});